Return-Path: 
 <ooo-commits-return-9383-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 72FC29759
	for <apmail-incubator-ooo-commits-archive@minotaur.apache.org>;
 Wed,  2 May 2012 19:35:33 +0000 (UTC)
Received: (qmail 20670 invoked by uid 500); 2 May 2012 19:35:30 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 20627 invoked by uid 500); 2 May 2012 19:35:30 -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 20581 invoked by uid 99); 2 May 2012 19:35:30 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2012 19:35:30 +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; Wed, 02 May 2012 19:35:29 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4C9A62388860;
	Wed,  2 May 2012 19:35:09 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1333165 -
 /incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
Date: Wed, 02 May 2012 19:35:09 -0000
To: ooo-commits@incubator.apache.org
From: pfg@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120502193509.4C9A62388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: pfg
Date: Wed May  2 19:35:08 2012
New Revision: 1333165

URL: http://svn.apache.org/viewvc?rev=1333165&view=rev
Log:
Add Oracle as a Java vendor for Solaris.

Modified:
    incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml

Modified: incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml?rev=1333165&r1=1333164&r2=1333165&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml (original)
+++ incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml Wed May  2 19:35:08 2012
@@ -23,15 +23,19 @@
 <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> 
+ <vendorInfos>
+  <vendor name="Oracle Corporation">
+    <minVersion>1.7.0</minVersion>
+  </vendor>
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>
   </vendor>
  </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>
  </plugins>
 </javaSelection>