You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2012/06/28 00:50:06 UTC
svn commit: r1354768 - in /incubator/ooo/symphony/trunk/main/jvmfwk: ./
distributions/OpenOfficeorg/javavendors_freebsd.xml
distributions/OpenOfficeorg/javavendors_unx.xml
Author: pfg
Date: Wed Jun 27 22:50:04 2012
New Revision: 1354768
URL: http://svn.apache.org/viewvc?rev=1354768&view=rev
Log:
Merge r1329539, r1333165 - Add Oracle as a Java vendor for FreeBSD and UNIX.
Modified:
incubator/ooo/symphony/trunk/main/jvmfwk/ (props changed)
incubator/ooo/symphony/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
incubator/ooo/symphony/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
Propchange: incubator/ooo/symphony/trunk/main/jvmfwk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jun 27 22:50:04 2012
@@ -0,0 +1 @@
+/incubator/ooo/trunk/main/jvmfwk:1184918,1190602,1329539,1329547,1333151,1333165
Modified: incubator/ooo/symphony/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/symphony/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml?rev=1354768&r1=1354767&r2=1354768&view=diff
==============================================================================
--- incubator/ooo/symphony/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml (original)
+++ incubator/ooo/symphony/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml Wed Jun 27 22:50:04 2012
@@ -3,9 +3,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.3.1</minVersion>
</vendor>
@@ -18,6 +21,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/symphony/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/symphony/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml?rev=1354768&r1=1354767&r2=1354768&view=diff
==============================================================================
--- incubator/ooo/symphony/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml (original)
+++ incubator/ooo/symphony/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml Wed Jun 27 22:50:04 2012
@@ -3,15 +3,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>