From a72a7dc500ffd57662e8b9be61e4676266861c33 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 3 Nov 2011 14:11:00 +0100
Subject: fdo#42312: Change bsh and js script providers from extensions to
 optional modules.

Their jar files reference other non-URE jars, so they cannot be extensions.
bsh.jar has been moved into the optional module (it used to be installed
always, but it looks like only the bsh script provider needs it; also, it
had been added to URE_MORE_JAVA_CLASSPATH_URLS if SYSTEM_BSH, which also
appears unnecessary as it is mentioned with an absolute file URL in the
Class-Path of the script provider jar).
js.jar has been included in the optional module (it used to be not installed
at all?).
---
 scripting/util/provider/beanshell/description.xml  | 23 ----------------------
 scripting/util/provider/beanshell/manifest.xml     |  7 -------
 scripting/util/provider/javascript/description.xml | 23 ----------------------
 scripting/util/provider/javascript/manifest.xml    |  7 -------
 4 files changed, 60 deletions(-)
 delete mode 100644 scripting/util/provider/beanshell/description.xml
 delete mode 100755 scripting/util/provider/beanshell/manifest.xml
 delete mode 100644 scripting/util/provider/javascript/description.xml
 delete mode 100755 scripting/util/provider/javascript/manifest.xml

(limited to 'scripting/util')

diff --git a/scripting/util/provider/beanshell/description.xml b/scripting/util/provider/beanshell/description.xml
deleted file mode 100644
index 8d8a4a88ead3..000000000000
--- a/scripting/util/provider/beanshell/description.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<description
-  xmlns="http://openoffice.org/extensions/description/2006"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns:dep="http://openoffice.org/extensions/description/2006">
-
-  <identifier value="com.sun.star.script.provider.ScriptProviderForBeanShell"/>
-
-  <dependencies>
-    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
-  </dependencies>
-
-  <version value="3.3.0"/>
-
-  <publisher>
-    <name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
-  </publisher>
-
-  <display-name>
-    <name lang="en-US">Script provider for BeanShell</name>
-  </display-name>
-
-</description>
diff --git a/scripting/util/provider/beanshell/manifest.xml b/scripting/util/provider/beanshell/manifest.xml
deleted file mode 100755
index da8e620281a0..000000000000
--- a/scripting/util/provider/beanshell/manifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
-  <manifest:file-entry
-    manifest:media-type="application/vnd.sun.star.uno-component;type=java"
-    manifest:full-path="ScriptProviderForBeanShell.jar"/>
-</manifest:manifest>
diff --git a/scripting/util/provider/javascript/description.xml b/scripting/util/provider/javascript/description.xml
deleted file mode 100644
index 08c0284b20c2..000000000000
--- a/scripting/util/provider/javascript/description.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<description
-  xmlns="http://openoffice.org/extensions/description/2006"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns:dep="http://openoffice.org/extensions/description/2006">
-
-  <identifier value="com.sun.star.script.provider.ScriptProviderForJavaScript"/>
-
-  <dependencies>
-    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
-  </dependencies>
-
-  <version value="3.3.0"/>
-
-  <publisher>
-    <name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
-  </publisher>
-
-  <display-name>
-    <name lang="en-US">Script provider for JavaScript</name>
-  </display-name>
-
-</description>
diff --git a/scripting/util/provider/javascript/manifest.xml b/scripting/util/provider/javascript/manifest.xml
deleted file mode 100755
index d052ad8bc3ea..000000000000
--- a/scripting/util/provider/javascript/manifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
-  <manifest:file-entry
-    manifest:media-type="application/vnd.sun.star.uno-component;type=java"
-    manifest:full-path="ScriptProviderForJavaScript.jar"/>
-</manifest:manifest>
-- 
cgit