From cb5000280e292042f36b07f2484026a4382899f9 Mon Sep 17 00:00:00 2001
From: Pedro Giffuni <pfg@apache.org>
Date: Wed, 2 May 2012 18:35:08 +0000
Subject: Add Oracle as a Java vendor for Solaris.

Conflicts:
	jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml

Change-Id: Ifaa60fafb0db62ed60ba4080b6bb3713d8d9e3be
---
 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'jvmfwk')

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 8294db9ffdda..8430a010b867 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -20,15 +20,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>
+  <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/libsunjavaplugin.so</library>
   <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
  </plugins>
 </javaSelection>
-- 
cgit