Remove jvmfwk plugin feature

...which was effectively unused; there only ever was a single sunjavaplugin that
is now folded directly into jvmfwk.  Leaves room for further clean up.

Change-Id: I14dd2a3a09bd1ce9a8c3f5c156628ec11d954a0b

7 files changed, 1 insertions, 63 deletions

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors.xsd b/jvmfwk/distributions/OpenOfficeorg/javavendors.xsd
index 34a0cd579ec8..fbc643f713c7 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors.xsd
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors.xsd
@@ -21,33 +21,16 @@
         xmlns="http://www.w3.org/2001/XMLSchema"
         elementFormDefault="qualified">
  <element name="javaSelection" type="jf:JavaSelectionType">
-  <unique name="dummy1">
-   <selector xpath="jf:plugins/jf:library"/>
-   <field xpath="@vendor"/>
-  </unique>
-  
-  
-  <keyref name="dummy2" refer="jf:pluginKey">
-   <selector xpath="jf:vendorInfos/jf:vendor"/>
-   <field xpath="@name"/>
-  </keyref>
-
   <unique name="dummy3">
    <selector xpath="jf:vendorInfos/jf:vendor"/>
    <field xpath="@name"/>
   </unique>
-
-  <key name="pluginKey">
-   <selector xpath="jf:plugins/jf:library"/>
-   <field xpath="@vendor"/>
-  </key>
  </element>
  
  <complexType name="JavaSelectionType">
   <sequence>
    <element name="updated" type="date"/>
    <element name="vendorInfos" type="jf:VendorInfoType"/>
-   <element name="plugins" type="jf:PluginType"/>
   </sequence>
  </complexType>
  
@@ -57,21 +40,7 @@
    <element name="vendor" type="jf:VendorType"  minOccurs="0" maxOccurs="unbounded"/>
   </sequence>
  </complexType>
- 
- <complexType name="PluginType">
-  <sequence>
-   <element name="library" type="jf:LibraryType" minOccurs="0" maxOccurs="unbounded"/>
-  </sequence>
- </complexType>
 
- <complexType name="LibraryType">
-  <simpleContent>
-    <extension base="string">
-     <attribute name="vendor" use="required" type="string"/>
-    </extension>
-  </simpleContent>
- </complexType>
-     
  <complexType name="VendorType">
   <sequence>
    <element name="minVersion" type="string" minOccurs="0"/>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index bfd80e0a926a..13089bca3000 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -37,10 +37,4 @@
   </vendor>
  </vendorInfos>
 
- <plugins>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
-  <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
-  <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
- </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 311bf8146c0f..1c8c8bd32cdc 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -43,12 +43,4 @@
   </vendor>
  </vendorInfos>
 
- <plugins>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
-  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
-  <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
-  <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
-  <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
- </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index aa8b423a348e..e2925ee8aaaa 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -33,9 +33,5 @@
   <minVersion>1.7.0</minVersion>
  </vendor>
  </vendorInfos>
- <plugins>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.dylib</library>
-  <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.dylib</library>
-  <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.dylib</library>
- </plugins>
+
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
index 9bc0c4119da4..f4e5fb8306ba 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
@@ -45,8 +45,4 @@ look like.
   </vendor>
  </vendorInfos>
 
- <plugins>
-  <library vendor="Sun Microsystems Inc.">libsunjavapluginlo.dll</library>
-  <library vendor="VendorX">./pluginDir/vendorx.dll</library>
- </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index e9bbd68887fc..c7b0568c2d18 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -31,8 +31,4 @@
   </vendor>
  </vendorInfos>
 
- <plugins>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
- </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 5b33aad6a777..4f76089863b9 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -34,9 +34,4 @@
   </vendor>
  </vendorInfos>
 
- <plugins>
-  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavapluginlo.dll</library>
-  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavapluginlo.dll</library>
-  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavapluginlo.dll</library>
- </plugins>
 </javaSelection>