incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1348680 - in /incubator/ooo/trunk/main/jvmfwk: distributions/OpenOfficeorg/javavendors_linux.xml distributions/OpenOfficeorg/javavendors_wnt.xml plugins/sunmajor/pluginlib/sunjre.cxx
Date Sun, 10 Jun 2012 23:31:43 GMT
Author: arielch
Date: Sun Jun 10 23:31:42 2012
New Revision: 1348680

URL: http://svn.apache.org/viewvc?rev=1348680&view=rev
Log:
i66923 - Add support for JRockit JVM

Modified:
    incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
    incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
    incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

Modified: incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml?rev=1348680&r1=1348679&r2=1348680&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml (original)
+++ incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml Sun
Jun 10 23:31:42 2012
@@ -23,11 +23,11 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2011-01-07</updated>
+ <updated>2012-10-06</updated>
 
  <vendorInfos>
   <vendor name="Oracle Corporation">
-    <minVersion>1.7.0</minVersion>
+    <minVersion>1.6.0</minVersion>
   </vendor>
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>

Modified: incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml?rev=1348680&r1=1348679&r2=1348680&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml (original)
+++ incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml Sun Jun
10 23:31:42 2012
@@ -23,11 +23,11 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2011-01-07</updated>
+ <updated>2012-10-06</updated>
 
  <vendorInfos>
   <vendor name="Oracle Corporation">
-    <minVersion>1.7.0</minVersion>
+    <minVersion>1.6.0</minVersion>
   </vendor>
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>

Modified: incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx?rev=1348680&r1=1348679&r2=1348680&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx (original)
+++ incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Sun Jun 10 23:31:42
2012
@@ -63,13 +63,16 @@ char const* const* SunInfo::getRuntimePa
 #if defined(WNT)
         "/bin/client/jvm.dll",
         "/bin/hotspot/jvm.dll",
-        "/bin/classic/jvm.dll"
+        "/bin/classic/jvm.dll",
+        "/bin/jrockit/jvm.dll"
 #elif defined(OS2)
         "/bin/classic/jvm.dll",
+        // TODO add jrockit here
 #elif UNX
         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
-        "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
+        "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
+        "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
 #endif
 
     };



Mime
View raw message