i66923 - Add support for JRockit JVM

jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml

@@ -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>

jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml

@@ -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>

jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

@@ -63,13 +63,16 @@ char const* const* SunInfo::getRuntimePaths(int * size)
 #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
 
     };