Clean up javavendors_*.xml files

...and drop unnecessary javavendors_template.xml

Change-Id: Ib7f2d595d2086c1d3bf324f19693b9032cf00cd7

6 files changed, 83 insertions, 156 deletions

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 13089bca3000..c603575f3cb8 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -16,25 +16,20 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <updated>2012-07-12</updated>
-
- <vendorInfos>
-  <vendor name="Oracle Corporation">
-    <minVersion>1.7.0</minVersion>
-  </vendor>
-  <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.5.0</minVersion>
-  </vendor>
-  <vendor name="The FreeBSD Foundation">
-    <minVersion>1.6.0</minVersion>
-  </vendor>
-  <vendor name="Free Software Foundation, Inc.">
-    <minVersion>1.5.0</minVersion>
-  </vendor>
- </vendorInfos>
-
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
+  <updated>2012-07-12</updated>
+  <vendorInfos>
+    <vendor name="Oracle Corporation">
+      <minVersion>1.7.0</minVersion>
+    </vendor>
+    <vendor name="Sun Microsystems Inc.">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+    <vendor name="The FreeBSD Foundation">
+      <minVersion>1.6.0</minVersion>
+    </vendor>
+    <vendor name="Free Software Foundation, Inc.">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+  </vendorInfos>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 943b2ce1bf45..969ed01c6c21 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -16,34 +16,29 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <updated>2013-05-02</updated>
-
- <vendorInfos>
-  <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.5.0</minVersion>
-  </vendor>
-  <vendor name="Oracle Corporation">
-    <minVersion>1.6.0</minVersion>
-  </vendor>
-  <vendor name="IBM Corporation">
-    <minVersion>1.5.0</minVersion>
-  </vendor>
-  <vendor name="Blackdown Java-Linux Team">
-    <minVersion>1.5.0</minVersion>
-  </vendor>
-  <vendor name="Free Software Foundation, Inc.">
-    <minVersion>1.5.0</minVersion>
-  </vendor>
-  <vendor name="BEA Systems, Inc.">
-    <minVersion>1.5.0</minVersion>
-  </vendor>
-  <vendor name="Azul Systems, Inc.">
-    <minVersion>1.6.0</minVersion>
-  </vendor>
- </vendorInfos>
-
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
+  <updated>2013-05-02</updated>
+  <vendorInfos>
+    <vendor name="Sun Microsystems Inc.">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+    <vendor name="Oracle Corporation">
+      <minVersion>1.6.0</minVersion>
+    </vendor>
+    <vendor name="IBM Corporation">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+    <vendor name="Blackdown Java-Linux Team">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+    <vendor name="Free Software Foundation, Inc.">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+    <vendor name="BEA Systems, Inc.">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+    <vendor name="Azul Systems, Inc.">
+      <minVersion>1.6.0</minVersion>
+    </vendor>
+  </vendorInfos>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 61ab2e29a846..c2416582a793 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -16,25 +16,20 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <updated>2013-04-09</updated>
-
- <vendorInfos>
- <vendor name="Oracle Corporation">
-  <minVersion>1.7.0</minVersion>
- </vendor>
-  <vendor name="Apple Computer, Inc.">
-    <minVersion>1.5.0</minVersion>
-  </vendor>
- <vendor name="Apple Inc.">
-  <minVersion>1.5.0</minVersion>
- </vendor>
- <vendor name="Azul Systems, Inc.">
-  <minVersion>1.6.0</minVersion>
- </vendor>
-</vendorInfos>
-
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
+  <updated>2013-04-09</updated>
+  <vendorInfos>
+    <vendor name="Oracle Corporation">
+      <minVersion>1.7.0</minVersion>
+    </vendor>
+    <vendor name="Apple Computer, Inc.">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+    <vendor name="Apple Inc.">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+    <vendor name="Azul Systems, Inc.">
+      <minVersion>1.6.0</minVersion>
+    </vendor>
+  </vendorInfos>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
deleted file mode 100644
index f4e5fb8306ba..000000000000
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<!--
-This is a template for the javavendors.xml. It shows how the file could
-look like.
--->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://openoffice.org/2004/java/framework/1.0 file:/D:/cws-jl6/jvmfwk/source/javavendors.xsd" >
-
- <updated>2004-01-30</updated>
-
- <vendorInfos>
-  <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.3.1</minVersion>
-    <maxVersion>1.5.0</maxVersion>
-    <excludeVersions>
-     <version>1.4.1</version>
-    </excludeVersions>
-  </vendor>
-  <vendor name="VendorX">
-  <minVersion>1.4.2</minVersion>
-  <excludeVersions>
-    <version>1.5.0</version>
-    <version>1.4.3</version>
-   </excludeVersions>
-  </vendor>
- </vendorInfos>
-
-</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index c7b0568c2d18..fb79c003196e 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -16,19 +16,14 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <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>
-
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
+  <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>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 330461094180..0a37a4ea88a7 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -16,25 +16,20 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-
-<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <updated>2013-05-02</updated>
-
- <vendorInfos>
-  <vendor name="Oracle Corporation">
-    <minVersion>1.6.0</minVersion>
-  </vendor>
-  <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.5.0</minVersion>
-  </vendor>
-  <vendor name="IBM Corporation">
-    <minVersion>1.5.0</minVersion>
-  </vendor>
-  <vendor name="Azul Systems, Inc.">
-    <minVersion>1.6.0</minVersion>
-  </vendor>
- </vendorInfos>
-
+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
+  <updated>2013-05-02</updated>
+  <vendorInfos>
+    <vendor name="Oracle Corporation">
+      <minVersion>1.6.0</minVersion>
+    </vendor>
+    <vendor name="Sun Microsystems Inc.">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+    <vendor name="IBM Corporation">
+      <minVersion>1.5.0</minVersion>
+    </vendor>
+    <vendor name="Azul Systems, Inc.">
+      <minVersion>1.6.0</minVersion>
+    </vendor>
+  </vendorInfos>
 </javaSelection>