[Libreoffice-commits] core.git: jvmfwk/distributions

[Pedro Giffuni]

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

New commits:
commit cb5000280e292042f36b07f2484026a4382899f9
Author: Pedro Giffuni <pfg at apache.org>
Date:   Wed May 2 18:35:08 2012 +0000

    Add Oracle as a Java vendor for Solaris.
    
    Conflicts:
    	jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
    
    Change-Id: Ifaa60fafb0db62ed60ba4080b6bb3713d8d9e3be

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 8294db9..8430a01 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>