incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1347377 - in /incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg: javavendors_freebsd.xml javavendors_unx.xml
Date Thu, 07 Jun 2012 04:02:30 GMT
Author: pfg
Date: Thu Jun  7 04:02:30 2012
New Revision: 1347377

URL: http://svn.apache.org/viewvc?rev=1347377&view=rev
Log:
Merge r1329539, r1329547, 1333165 - Add Oracle as a Java vendor on unix.

Modified:
    incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
    incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml

Modified: incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml?rev=1347377&r1=1347376&r2=1347377&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
(original)
+++ incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
Thu Jun  7 04:02:30 2012
@@ -23,9 +23,12 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  
- <updated>2008-08-27</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>
@@ -38,6 +41,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="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
   <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>

Modified: incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml?rev=1347377&r1=1347376&r2=1347377&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
(original)
+++ incubator/ooo/branches/AOO34/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
Thu Jun  7 04:02:30 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>



Mime
View raw message