[Libreoffice-commits] .: scripting/java

[David Tardon]

 scripting/java/ScriptProviderForBeanShell.component  |   37 -------------------
 scripting/java/ScriptProviderForJavaScript.component |   37 -------------------
 scripting/java/makefile.mk                           |   18 ---------
 3 files changed, 92 deletions(-)

New commits:
commit 419ed023d2bc7538b979079f8197ff4325a0f20d
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 31 08:44:00 2011 +0200

    we ship these script providers as extensions

diff --git a/scripting/java/ScriptProviderForBeanShell.component b/scripting/java/ScriptProviderForBeanShell.component
deleted file mode 100755
index fe040d7..0000000
--- a/scripting/java/ScriptProviderForBeanShell.component
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<component loader="com.sun.star.loader.Java2"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.script.framework.provider.beanshell.ScriptProviderForBeanShell$_ScriptProviderForBeanShell">
-    <service name="com.sun.star.script.browse.BrowseNode"/>
-    <service name="com.sun.star.script.provider.LanguageScriptProvider"/>
-    <service name="com.sun.star.script.provider.ScriptProvider"/>
-    <service name="com.sun.star.script.provider.ScriptProviderForBeanShell"/>
-  </implementation>
-</component>
diff --git a/scripting/java/ScriptProviderForJavaScript.component b/scripting/java/ScriptProviderForJavaScript.component
deleted file mode 100755
index e9725d8..0000000
--- a/scripting/java/ScriptProviderForJavaScript.component
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<component loader="com.sun.star.loader.Java2"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.script.framework.provider.javascript.ScriptProviderForJavaScript$_ScriptProviderForJavaScript">
-    <service name="com.sun.star.script.browse.BrowseNode"/>
-    <service name="com.sun.star.script.provider.LanguageScriptProvider"/>
-    <service name="com.sun.star.script.provider.ScriptProvider"/>
-    <service name="com.sun.star.script.provider.ScriptProviderForJavaScript"/>
-  </implementation>
-</component>
diff --git a/scripting/java/makefile.mk b/scripting/java/makefile.mk
index dc8ee1a..8109c91 100755
--- a/scripting/java/makefile.mk
+++ b/scripting/java/makefile.mk
@@ -39,9 +39,7 @@ ALLTAR : ANTBUILD
 
 ALLTAR : \
     $(MISC)/ScriptFramework.component \
-    $(MISC)/ScriptProviderForBeanShell.component \
     $(MISC)/ScriptProviderForJava.component \
-    $(MISC)/ScriptProviderForJavaScript.component
 
 $(MISC)/ScriptFramework.component .ERRREMOVE : \
         $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component
@@ -49,24 +47,8 @@ $(MISC)/ScriptFramework.component .ERRREMOVE : \
         '$(COMPONENTPREFIX_BASIS_JAVA)ScriptFramework.jar' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component
 
-$(MISC)/ScriptProviderForBeanShell.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt \
-        ScriptProviderForBeanShell.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForBeanShell.jar' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt \
-        ScriptProviderForBeanShell.component
-
 $(MISC)/ScriptProviderForJava.component .ERRREMOVE : \
         $(SOLARENV)/bin/createcomponent.xslt ScriptProviderForJava.component
     $(XSLTPROC) --nonet --stringparam uri \
         '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForJava.jar' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt ScriptProviderForJava.component
-
-$(MISC)/ScriptProviderForJavaScript.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt \
-        ScriptProviderForJavaScript.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForJavaScript.jar' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt \
-        ScriptProviderForJavaScript.component