Return-Path: 
 <ooo-commits-return-11536-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id ACA5AD419
	for <apmail-incubator-ooo-commits-archive@minotaur.apache.org>;
 Tue, 19 Jun 2012 13:07:12 +0000 (UTC)
Received: (qmail 61406 invoked by uid 500); 19 Jun 2012 13:07:12 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 61373 invoked by uid 500); 19 Jun 2012 13:07:12 -0000
Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ooo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ooo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ooo-commits@incubator.apache.org>
List-Id: <ooo-commits.incubator.apache.org>
Reply-To: ooo-dev@incubator.apache.org
Delivered-To: mailing list ooo-commits@incubator.apache.org
Received: (qmail 61366 invoked by uid 99); 19 Jun 2012 13:07:12 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2012 13:07:12 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2012 13:07:11 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 381222388DDB;
	Tue, 19 Jun 2012 13:06:51 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1351699 - in /incubator/ooo/trunk/main/jvmfwk:
 distributions/OpenOfficeorg/javavendors_os2.xml
 plugins/sunmajor/pluginlib/sunjre.cxx
 plugins/sunmajor/pluginlib/sunversion.cxx
 plugins/sunmajor/pluginlib/sunversion.hxx
Date: Tue, 19 Jun 2012 13:06:51 -0000
To: ooo-commits@incubator.apache.org
From: ydario@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120619130651.381222388DDB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ydario
Date: Tue Jun 19 13:06:50 2012
New Revision: 1351699

URL: http://svn.apache.org/viewvc?rev=1351699&view=rev
Log:
i118923 - OS/2 port: more work on Java support, correctly identify new OpenJDK 1.6 client library.

Modified:
    incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
    incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
    incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
    incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx

Modified: incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml?rev=1351699&r1=1351698&r2=1351699&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml (original)
+++ incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml Tue Jun 19 13:06:50 2012
@@ -22,20 +22,24 @@
 
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- 
- <updated>2004-01-30</updated>
- 
- <vendorInfos> 
+
+ <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>

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=1351699&r1=1351698&r2=1351699&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx (original)
+++ incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Tue Jun 19 13:06:50 2012
@@ -67,6 +67,7 @@ char const* const* SunInfo::getRuntimePa
         "/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",

Modified: incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx?rev=1351699&r1=1351698&r2=1351699&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx (original)
+++ incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Tue Jun 19 13:06:50 2012
@@ -215,6 +215,10 @@ SunVersion::PreRelease SunVersion::getPr
 {
     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"))

Modified: incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx?rev=1351699&r1=1351698&r2=1351699&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx (original)
+++ incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx Tue Jun 19 13:06:50 2012
@@ -76,6 +76,10 @@ protected:
 	,
         Rel_FreeBSD
 #endif
+#if defined(OS2)
+	,
+        Rel_OS2
+#endif
     };
 
     //contains major,minor,micro,update