|
 |
f9c6819 |
From 549e54fb2f8113502743c443d6deadfe648dede1 Mon Sep 17 00:00:00 2001
|
|
|
f9c6819 |
From: Hanno Meyer-Thurow <h.mth@web.de>
|
|
|
f9c6819 |
Date: Tue, 13 Sep 2011 13:23:28 +0100
|
|
|
f9c6819 |
Subject: [PATCH] add Oracle Java 1.7.0 recognition
|
|
|
f9c6819 |
|
|
|
f9c6819 |
---
|
|
|
f9c6819 |
.../OpenOfficeorg/javavendors_linux.xml | 4 ++++
|
|
|
f9c6819 |
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2 ++
|
|
|
f9c6819 |
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 1 +
|
|
|
f9c6819 |
3 files changed, 7 insertions(+), 0 deletions(-)
|
|
|
f9c6819 |
|
|
|
f9c6819 |
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
|
|
|
f9c6819 |
index ed329e5..489511f 100644
|
|
|
f9c6819 |
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
|
|
|
f9c6819 |
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
|
|
|
f9c6819 |
@@ -9,6 +9,9 @@
|
|
|
f9c6819 |
<vendor name="Sun Microsystems Inc.">
|
|
|
f9c6819 |
<minVersion>1.5.0</minVersion>
|
|
|
f9c6819 |
</vendor>
|
|
|
f9c6819 |
+ <vendor name="Oracle Corporation">
|
|
|
f9c6819 |
+ <minVersion>1.7.0</minVersion>
|
|
|
f9c6819 |
+ </vendor>
|
|
|
f9c6819 |
<vendor name="IBM Corporation">
|
|
|
f9c6819 |
<minVersion>1.5.0</minVersion>
|
|
|
f9c6819 |
</vendor>
|
|
|
f9c6819 |
@@ -25,6 +28,7 @@
|
|
|
f9c6819 |
|
|
|
f9c6819 |
<plugins>
|
|
|
f9c6819 |
<library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
|
|
|
f9c6819 |
+ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
|
|
|
f9c6819 |
<library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
|
|
|
f9c6819 |
<library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
|
|
|
f9c6819 |
<library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
|
|
|
f9c6819 |
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
|
|
|
f9c6819 |
index 8567d79..91ad4c6 100644
|
|
|
f9c6819 |
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
|
|
|
f9c6819 |
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
|
|
|
f9c6819 |
@@ -112,6 +112,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
|
|
|
f9c6819 |
|
|
|
f9c6819 |
//Only do something if the sunjavaplugin created this JavaInfo
|
|
|
f9c6819 |
rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc."));
|
|
|
f9c6819 |
+ rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation"));
|
|
|
f9c6819 |
rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation"));
|
|
|
f9c6819 |
rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
|
|
|
f9c6819 |
rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc."));
|
|
|
f9c6819 |
@@ -121,6 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
|
|
|
f9c6819 |
rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
|
|
|
f9c6819 |
if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
|
|
|
f9c6819 |
|| sVendor2.equals(pInfo->sVendor) == sal_True
|
|
|
f9c6819 |
+ || sVendor9.equals(pInfo->sVendor) == sal_True
|
|
|
f9c6819 |
|| sVendor3.equals(pInfo->sVendor) == sal_True
|
|
|
f9c6819 |
|| sVendor4.equals(pInfo->sVendor) == sal_True
|
|
|
f9c6819 |
|| sVendor5.equals(pInfo->sVendor) == sal_True
|
|
|
f9c6819 |
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
|
|
|
f9c6819 |
index f24b6ff..5e87002 100644
|
|
|
f9c6819 |
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
|
|
|
f9c6819 |
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
|
|
|
f9c6819 |
@@ -52,6 +52,7 @@ namespace jfw_plugin
|
|
|
f9c6819 |
*/
|
|
|
f9c6819 |
BEGIN_VENDOR_MAP()
|
|
|
f9c6819 |
VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
|
|
|
f9c6819 |
+ VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
|
|
|
f9c6819 |
VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
|
|
|
f9c6819 |
VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)
|
|
|
f9c6819 |
VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo)
|
|
|
f9c6819 |
--
|
|
|
f9c6819 |
1.7.6.4
|
|
|
f9c6819 |
|