Add Oracle as a Java vendor for Solaris.

Conflicts:
	jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml

Change-Id: Ifaa60fafb0db62ed60ba4080b6bb3713d8d9e3be
This commit is contained in:
Pedro Giffuni 2012-05-02 18:35:08 +00:00 committed by Michael Stahl
parent e4088a68aa
commit cb5000280e

View File

@ -20,15 +20,19 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 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."> <vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion> <minVersion>1.5.0</minVersion>
</vendor> </vendor>
</vendorInfos> </vendorInfos>
<plugins> <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> <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
</plugins> </plugins>
</javaSelection> </javaSelection>