Tag: cws_src680_morejava
User: fridrich_strba
Date: 05/08/26 06:55:44
Modified:
/udk/jvmfwk/distributions/OpenOfficeorg/
javavendors_linux.xml
/udk/jvmfwk/distributions/ure/
javavendors_linux.xml
/udk/jvmfwk/plugins/sunmajor/javaenvsetup/
javaldx.cxx
/udk/jvmfwk/plugins/sunmajor/pluginlib/
otherjre.cxx, sunjre.cxx, vendorlist.cxx
Log:
Issue number:
Submitted by: fridrich_strba
Reviewed by: fridrich_strba
Add JRE of BEA Systems, Inc. among supported java virtual machines
File Changes:
Directory: /udk/jvmfwk/distributions/OpenOfficeorg/
===================================================
File [changed]: javavendors_linux.xml
Url:
http://udk.openoffice.org/source/browse/udk/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml?r1=1.6&r2=1.6.10.1
Delta lines: +4 -0
-------------------
--- javavendors_linux.xml 11 May 2005 11:30:56 -0000 1.6
+++ javavendors_linux.xml 26 Aug 2005 13:55:40 -0000 1.6.10.1
@@ -19,6 +19,9 @@
<vendor name="Free Software Foundation, Inc.">
<minVersion>1.4.2</minVersion>
</vendor>
+ <vendor name="BEA Systems, Inc.">
+ <minVersion>1.4.1</minVersion>
+ </vendor>
</vendorInfos>
<plugins>
@@ -26,5 +29,6 @@
<library vendor="IBM Corporation">sunjavaplugin.so</library>
<library vendor="Blackdown Java-Linux Team">sunjavaplugin.so</library>
<library vendor="Free Software Foundation, Inc.">sunjavaplugin.so</library>
+ <library vendor="BEA Systems, Inc.">sunjavaplugin.so</library>
</plugins>
</javaSelection>
Directory: /udk/jvmfwk/distributions/ure/
=========================================
File [changed]: javavendors_linux.xml
Url:
http://udk.openoffice.org/source/browse/udk/jvmfwk/distributions/ure/javavendors_linux.xml?r1=1.2&r2=1.2.4.1
Delta lines: +5 -2
-------------------
--- javavendors_linux.xml 17 Jun 2005 10:10:38 -0000 1.2
+++ javavendors_linux.xml 26 Aug 2005 13:55:40 -0000 1.2.4.1
@@ -3,9 +3,9 @@
*
* $RCSfile: javavendors_linux.xml,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.2.4.1 $
*
- * last change: $Author: obo $ $Date: 2005/06/17 10:10:38 $
+ * last change: $Author: fridrich_strba $ $Date: 2005/08/26 13:55:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,6 +75,9 @@
</vendor>
<vendor name="Free Software Foundation, Inc.">
<minVersion>1.4.2</minVersion>
+ </vendor>
+ <vendor name="BEA Systems, Inc.">
+ <minVersion>1.4.1</minVersion>
</vendor>
</vendorInfos>
<plugins>
Directory: /udk/jvmfwk/plugins/sunmajor/javaenvsetup/
=====================================================
File [changed]: javaldx.cxx
Url:
http://udk.openoffice.org/source/browse/udk/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx?r1=1.8&r2=1.8.24.1
Delta lines: +6 -4
-------------------
--- javaldx.cxx 31 Jan 2005 09:48:36 -0000 1.8
+++ javaldx.cxx 26 Aug 2005 13:55:40 -0000 1.8.24.1
@@ -2,9 +2,9 @@
*
* $RCSfile: javaldx.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.8.24.1 $
*
- * last change: $Author: rt $ $Date: 2005/01/31 09:48:36 $
+ * last change: $Author: fridrich_strba $ $Date: 2005/08/26 13:55:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -153,10 +153,12 @@
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 Computer,
Inc."));
+ rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
|| sVendor2.equals(pInfo->sVendor) == sal_True
|| sVendor3.equals(pInfo->sVendor) == sal_True
- || sVendor4.equals(pInfo->sVendor) == sal_True))
+ || sVendor4.equals(pInfo->sVendor) == sal_True
+ || sVendor5.equals(pInfo->sVendor) == sal_True))
return 0;
rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
Directory: /udk/jvmfwk/plugins/sunmajor/pluginlib/
==================================================
File [changed]: otherjre.cxx
Url:
http://udk.openoffice.org/source/browse/udk/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx?r1=1.7&r2=1.7.2.1
Delta lines: +7 -4
-------------------
--- otherjre.cxx 18 Aug 2005 08:21:51 -0000 1.7
+++ otherjre.cxx 26 Aug 2005 13:55:41 -0000 1.7.2.1
@@ -2,9 +2,9 @@
*
* $RCSfile: otherjre.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.7.2.1 $
*
- * last change: $Author: rt $ $Date: 2005/08/18 08:21:51 $
+ * last change: $Author: fridrich_strba $ $Date: 2005/08/26 13:55:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,6 +97,7 @@
"/bin/client/jvm.dll",
"/bin/hotspot/jvm.dll",
"/bin/classic/jvm.dll"
+ "/bin/jrockit/jvm.dll"
#elif UNX
#ifdef MACOSX
"/../../../JavaVM"
@@ -105,6 +106,7 @@
"/jre/bin/classic/libjvm.so", // for IBM Java
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" // for Blackdown PPC
+ "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" // for Java of BEA Systems
#endif
#endif
@@ -128,6 +130,7 @@
"/jre/bin/classic",
"/lib/" JFW_PLUGIN_ARCH "/client",
"/lib/" JFW_PLUGIN_ARCH "/classic",
+ "/lib/" JFW_PLUGIN_ARCH "/jrockit",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
"/lib/" JFW_PLUGIN_ARCH
#endif
File [changed]: sunjre.cxx
Url:
http://udk.openoffice.org/source/browse/udk/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx?r1=1.3&r2=1.3.32.1
Delta lines: +4 -3
-------------------
--- sunjre.cxx 16 Dec 2004 11:44:52 -0000 1.3
+++ sunjre.cxx 26 Aug 2005 13:55:41 -0000 1.3.32.1
@@ -2,9 +2,9 @@
*
* $RCSfile: sunjre.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.3.32.1 $
*
- * last change: $Author: kz $ $Date: 2004/12/16 11:44:52 $
+ * last change: $Author: fridrich_strba $ $Date: 2005/08/26 13:55:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -102,6 +102,7 @@
"/bin/classic/jvm.dll"
#elif UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+ "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
#endif
File [changed]: vendorlist.cxx
Url:
http://udk.openoffice.org/source/browse/udk/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx?r1=1.4&r2=1.4.26.1
Delta lines: +4 -3
-------------------
--- vendorlist.cxx 25 Jan 2005 15:19:28 -0000 1.4
+++ vendorlist.cxx 26 Aug 2005 13:55:41 -0000 1.4.26.1
@@ -2,9 +2,9 @@
*
* $RCSfile: vendorlist.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.4.26.1 $
*
- * last change: $Author: obo $ $Date: 2005/01/25 15:19:28 $
+ * last change: $Author: fridrich_strba $ $Date: 2005/08/26 13:55:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,6 +81,7 @@
VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)
VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo)
+ VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
END_VENDOR_MAP()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
