i118923 - OS/2 port: more work on Java support, correctly identify new OpenJDK 1.6 client library.

jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml

@@ -23,19 +23,23 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2004-01-30</updated>
+ <updated>2011-01-07</updated>
 
  <vendorInfos>
+  <vendor name="Oracle Corporation">
+    <minVersion>1.7.0</minVersion>
+  </vendor>
   <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.4.2</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
   <vendor name="IBM Corporation">
-    <minVersion>1.4.2</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
  </vendorInfos>
 
  <plugins>
-  <library vendor="Sun Microsystems Inc.">sunjavap.dll</library>
-  <library vendor="IBM Corporation">sunjavap.dll</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavap.dll</library>
+  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavap.dll</library>
+  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavap.dll</library>
  </plugins>
 </javaSelection>

jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

@@ -67,6 +67,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
         "/bin/jrockit/jvm.dll"
 #elif defined(OS2)
         "/bin/classic/jvm.dll",
+        "/bin/client/jvm.dll",
         // TODO add jrockit here
 #elif UNX
         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",

jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx

@@ -215,6 +215,10 @@ SunVersion::PreRelease SunVersion::getPreRelease(const char *szRelease)
 {
     if (szRelease == NULL)
         return Rel_NONE;
+#ifdef OS2
+    // all prerelases codes are threated the same way (-ga1, -ga2, ...)
+        return Rel_OS2;
+#endif
     if( ! strcmp(szRelease,"ea"))
         return  Rel_EA;
     else if( ! strcmp(szRelease,"ea1"))

jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx

@@ -75,6 +75,10 @@ protected:
 #if defined(FREEBSD)
     ,
         Rel_FreeBSD
+#endif
+#if defined(OS2)
+    ,
+        Rel_OS2
 #endif
     };