Return-Path: 
 <ooo-commits-return-6010-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 CCA4699A1
	for <apmail-incubator-ooo-commits-archive@minotaur.apache.org>;
 Mon,  9 Jan 2012 21:47:12 +0000 (UTC)
Received: (qmail 48783 invoked by uid 500); 9 Jan 2012 21:47:12 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 48750 invoked by uid 500); 9 Jan 2012 21:47: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 48743 invoked by uid 99); 9 Jan 2012 21:47:12 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jan 2012 21:47: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; Mon, 09 Jan 2012 21:47:09 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0B3752388860;
	Mon,  9 Jan 2012 21:46:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1229371 - in /incubator/ooo/trunk/main/jvmfwk:
 distributions/OpenOfficeorg/ plugins/sunmajor/javaenvsetup/
 plugins/sunmajor/pluginlib/
Date: Mon, 09 Jan 2012 21:46:47 -0000
To: ooo-commits@incubator.apache.org
From: arielch@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120109214648.0B3752388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: arielch
Date: Mon Jan  9 21:46:47 2012
New Revision: 1229371

URL: http://svn.apache.org/viewvc?rev=1229371&view=rev
Log:
i118352 - Add "Oracle Corporation" as a valid Java vendor

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/javaenvsetup/javaldx.cxx
    incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
    incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.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=1229371&r1=1229370&r2=1229371&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml (original)
+++ incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml Mon Jan  9 21:46:47 2012
@@ -2,10 +2,13 @@
 
 <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.5.0</minVersion>
   </vendor>
@@ -24,6 +27,7 @@
  </vendorInfos>
 
  <plugins>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
   <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
   <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
   <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>

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=1229371&r1=1229370&r2=1229371&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml (original)
+++ incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml Mon Jan  9 21:46:47 2012
@@ -2,10 +2,13 @@
 
 <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.5.0</minVersion>
   </vendor>
@@ -15,6 +18,7 @@
  </vendorInfos>
 
  <plugins>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
   <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
   <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library>
  </plugins>

Modified: incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx?rev=1229371&r1=1229370&r2=1229371&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx (original)
+++ incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx Mon Jan  9 21:46:47 2012
@@ -111,6 +111,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
     
     //Only do something if the sunjavaplugin created this JavaInfo
+    rtl::OUString sVendor0(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation"));
     rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc."));
     rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation"));
     rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
@@ -119,7 +120,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
     rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
     rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
-    if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
+    if ( ! (sVendor0.equals(pInfo->sVendor) == sal_True
+            || sVendor1.equals(pInfo->sVendor) == sal_True
             || sVendor2.equals(pInfo->sVendor) == sal_True
             || sVendor3.equals(pInfo->sVendor) == sal_True
             || sVendor4.equals(pInfo->sVendor) == sal_True

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=1229371&r1=1229370&r2=1229371&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx (original)
+++ incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Mon Jan  9 21:46:47 2012
@@ -29,14 +29,13 @@
 #include "sunversion.hxx"
 #include "diagnostics.h"
 
-using namespace rtl;
 using namespace std;
 
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 namespace jfw_plugin
 {
 
-Reference<VendorBase> SunInfo::createInstance()
+rtl::Reference<VendorBase> SunInfo::createInstance()
 {
     return new SunInfo;
 }
@@ -80,7 +79,7 @@ char const* const* SunInfo::getRuntimePa
 
 char const* const* SunInfo::getLibraryPaths(int* size)
 {
-#ifdef UNX        
+#ifdef UNX
     static char const * ar[] = {
 
         "/lib/" JFW_PLUGIN_ARCH "/client",
@@ -98,12 +97,12 @@ char const* const* SunInfo::getLibraryPa
 
 int SunInfo::compareVersions(const rtl::OUString& sSecond) const
 {
-    OUString sFirst = getVersion();
-    
+    rtl::OUString sFirst = getVersion();
+
     SunVersion version1(sFirst);
     JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION
                                " does not know the version: ")
-               + sFirst + OUSTR(" as valid for a SUN JRE."));
+               + sFirst + OUSTR(" as valid for a SUN/Oracle JRE."));
     SunVersion version2(sSecond);
     if ( ! version2)
         throw MalformedVersionException();

Modified: incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx?rev=1229371&r1=1229370&r2=1229371&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx (original)
+++ incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx Mon Jan  9 21:46:47 2012
@@ -42,6 +42,7 @@ namespace jfw_plugin
    by "\xXX\xXX"
  */
 BEGIN_VENDOR_MAP()
+    VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
     VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
     VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
     VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)