| 1 |
From 549e54fb2f8113502743c443d6deadfe648dede1 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Hanno Meyer-Thurow <h.mth@web.de> |
| 3 |
Date: Tue, 13 Sep 2011 13:23:28 +0100 |
| 4 |
Subject: [PATCH] add Oracle Java 1.7.0 recognition |
| 5 |
|
| 6 |
--- |
| 7 |
.../OpenOfficeorg/javavendors_linux.xml | 4 ++++ |
| 8 |
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2 ++ |
| 9 |
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 1 + |
| 10 |
3 files changed, 7 insertions(+), 0 deletions(-) |
| 11 |
|
| 12 |
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |
| 13 |
index ed329e5..489511f 100644 |
| 14 |
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |
| 15 |
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |
| 16 |
@@ -9,6 +9,9 @@ |
| 17 |
<vendor name="Sun Microsystems Inc."> |
| 18 |
<minVersion>1.5.0</minVersion> |
| 19 |
</vendor> |
| 20 |
+ <vendor name="Oracle Corporation"> |
| 21 |
+ <minVersion>1.7.0</minVersion> |
| 22 |
+ </vendor> |
| 23 |
<vendor name="IBM Corporation"> |
| 24 |
<minVersion>1.5.0</minVersion> |
| 25 |
</vendor> |
| 26 |
@@ -25,6 +28,7 @@ |
| 27 |
|
| 28 |
<plugins> |
| 29 |
<library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> |
| 30 |
+ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> |
| 31 |
<library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> |
| 32 |
<library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> |
| 33 |
<library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> |
| 34 |
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |
| 35 |
index 8567d79..91ad4c6 100644 |
| 36 |
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |
| 37 |
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |
| 38 |
@@ -112,6 +112,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) |
| 39 |
|
| 40 |
//Only do something if the sunjavaplugin created this JavaInfo |
| 41 |
rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc.")); |
| 42 |
+ rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation")); |
| 43 |
rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation")); |
| 44 |
rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team")); |
| 45 |
rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc.")); |
| 46 |
@@ -121,6 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) |
| 47 |
rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation")); |
| 48 |
if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True |
| 49 |
|| sVendor2.equals(pInfo->sVendor) == sal_True |
| 50 |
+ || sVendor9.equals(pInfo->sVendor) == sal_True |
| 51 |
|| sVendor3.equals(pInfo->sVendor) == sal_True |
| 52 |
|| sVendor4.equals(pInfo->sVendor) == sal_True |
| 53 |
|| sVendor5.equals(pInfo->sVendor) == sal_True |
| 54 |
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx |
| 55 |
index f24b6ff..5e87002 100644 |
| 56 |
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx |
| 57 |
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx |
| 58 |
@@ -52,6 +52,7 @@ namespace jfw_plugin |
| 59 |
*/ |
| 60 |
BEGIN_VENDOR_MAP() |
| 61 |
VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) |
| 62 |
+ VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) |
| 63 |
VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo) |
| 64 |
VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo) |
| 65 |
VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo) |
| 66 |
-- |
| 67 |
1.7.6.4 |
| 68 |
|
Parent Directory
| 
Revision Log