diff options
| author | Hanno Meyer-Thurow <h.mth@web.de> | 2011-09-13 13:23:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-13 13:23:28 +0100 |
| commit | 549e54fb2f8113502743c443d6deadfe648dede1 (patch) | |
| tree | 871985fe5982718b15fcf2c5e820462ab329048c | |
| parent | 59585dab4bf00e4979fdfd8ce6c038ead143996e (diff) | |
add Oracle Java 1.7.0 recognition
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 4 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index ed329e5788d3..489511f5aff6 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -9,6 +9,9 @@ <vendor name="Sun Microsystems Inc."> <minVersion>1.5.0</minVersion> </vendor> + <vendor name="Oracle Corporation"> + <minVersion>1.7.0</minVersion> + </vendor> <vendor name="IBM Corporation"> <minVersion>1.5.0</minVersion> </vendor> @@ -25,6 +28,7 @@ <plugins> <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 8567d79f9b0e..91ad4c627162 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -112,6 +112,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) //Only do something if the sunjavaplugin created this JavaInfo rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc.")); + rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation")); rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation")); rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team")); rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc.")); @@ -121,6 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation")); if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True || sVendor2.equals(pInfo->sVendor) == sal_True + || sVendor9.equals(pInfo->sVendor) == sal_True || sVendor3.equals(pInfo->sVendor) == sal_True || sVendor4.equals(pInfo->sVendor) == sal_True || sVendor5.equals(pInfo->sVendor) == sal_True diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index f24b6ff166e4..5e87002bb2fe 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -52,6 +52,7 @@ namespace jfw_plugin */ BEGIN_VENDOR_MAP() VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) + VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo) VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo) VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo) |