diff options
25 files changed, 166 insertions, 259 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index b983928ab99f..e40327e9d846 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -368,7 +368,10 @@ my_components += component/avmedia/source/gstreamer/avmediagstreamer .INCLUDE: target.mk -ALLTAR : $(MISC)/services.rdb +ALLTAR : \ + $(MISC)/services.rdb \ + $(MISC)/scriptproviderforbeanshell.rdb \ + $(MISC)/scriptproviderforjavascript.rdb $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component") @@ -379,3 +382,29 @@ $(MISC)/services.input : makefile.mk echo \ '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \ > $@ + +$(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/scriptproviderforbeanshell.input \ + $(SOLARXMLDIR)/component/scripting/java/ScriptProviderForBeanShell.component + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/scriptproviderforbeanshell.input + +$(MISC)/scriptproviderforbeanshell.input : makefile.mk + echo \ + '<list><filename>component/scripting/java/ScriptProviderForBeanShell.component</filename></list>' \ + > $@ + +$(MISC)/scriptproviderforjavascript.rdb .ERRREMOVE : \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/scriptproviderforjavascript.input \ + $(SOLARXMLDIR)/component/scripting/java/ScriptProviderForJavaScript.component + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/scriptproviderforjavascript.input + +$(MISC)/scriptproviderforjavascript.input : makefile.mk + echo \ + '<list><filename>component/scripting/java/ScriptProviderForJavaScript.component</filename></list>' \ + > $@ diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst index 171e9db91e33..f6be8cf864ab 100644 --- a/postprocess/prj/d.lst +++ b/postprocess/prj/d.lst @@ -2,4 +2,6 @@ mkdir: %_DEST%\xml\ooo ..\%__SRC%\bin\uiconfig.zip %_DEST%\bin\uiconfig.zip ..\%__SRC%\misc\*.xcd %_DEST%\xml\ ..\%__SRC%\misc\lang\*.xcd %_DEST%\xml\ +..\%__SRC%\misc\scriptproviderforbeanshell.rdb %_DEST%\xml\scriptproviderforbeanshell.rdb +..\%__SRC%\misc\scriptproviderforjavascript.rdb %_DEST%\xml\scriptproviderforjavascript.rdb ..\%__SRC%\misc\services.rdb %_DEST%\xml\services.rdb diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index 0ccc3f3b44f2..abb299982975 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -262,28 +262,6 @@ End #endif -/* ** Script provider for BeanShell ** */ - -#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL - -Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell - ParentID = gid_Brand_Dir_Share_Extensions; - DosName = "script-provider-for-beanshell"; -End - -#endif - -/* ** Script provider for JavaScript ** */ - -#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT - -Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript - ParentID = gid_Brand_Dir_Share_Extensions; - DosName = "script-provider-for-javascript"; -End - -#endif - /* ** Script provider for Python ** */ #ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 4397c3716e9a..502bcf1b02b2 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -302,26 +302,36 @@ End /* ** Script provider for BeanShell ** */ -#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL -File gid_File_Oxt_Script_Provider_For_Beanshell +#if !defined SYSTEM_BSH +STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) +#endif + +STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) + +File gid_File_Rdb_Scriptproviderforbeanshell TXT_FILE_BODY; - Styles = (PACKED, ARCHIVE); - Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell; - Name = "script-provider-for-beanshell.oxt"; + Name = "scriptproviderforbeanshell.rdb"; + Dir = gid_Brand_Dir_Program_Services; + Styles = (PACKED); End #endif /* ** Script provider for JavaScript ** */ -#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT -File gid_File_Oxt_Script_Provider_For_Javascript +STD_JAR_FILE( gid_File_Jar_Js, js ) + +STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript ) + +File gid_File_Rdb_Scriptproviderforjavascript TXT_FILE_BODY; - Styles = (PACKED, ARCHIVE); - Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript; - Name = "script-provider-for-javascript.oxt"; + Name = "scriptproviderforjavascript.rdb"; + Dir = gid_Brand_Dir_Program_Services; + Styles = (PACKED); End #endif diff --git a/scp2/source/extensions/makefile.mk b/scp2/source/extensions/makefile.mk index 1c856401aa37..00b23aeec030 100644 --- a/scp2/source/extensions/makefile.mk +++ b/scp2/source/extensions/makefile.mk @@ -39,6 +39,10 @@ TARGETTYPE=CUI .INCLUDE : settings.mk +.IF "$(SYSTEM_BSH)" == "YES" +SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\" +.ENDIF + SCP_PRODUCT_TYPE=osl PARFILES= \ module_extensions.par \ diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 255930178b38..e3514bc4e94c 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -339,14 +339,16 @@ End /* ** Script provider for BeanShell ** */ -#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL +#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell PackageInfo = "packinfo_extensions.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL); ParentID = gid_Module_Optional_Extensions; Files = ( - gid_File_Oxt_Script_Provider_For_Beanshell ); + gid_File_Jar_Bsh, + gid_File_Jar_Scriptproviderforbeanshell, + gid_File_Rdb_Scriptproviderforbeanshell ); Minimal = NO; Default = YES; Styles = ( ); @@ -356,14 +358,16 @@ End /* ** Script provider for JavaScript ** */ -#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT +#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript PackageInfo = "packinfo_extensions.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT); ParentID = gid_Module_Optional_Extensions; Files = ( - gid_File_Oxt_Script_Provider_For_Javascript ); + gid_File_Jar_Js, + gid_File_Jar_Scriptproviderforjavascript, + gid_File_Rdb_Scriptproviderforjavascript ); Minimal = NO; Default = YES; Styles = ( ); diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 710cdb8863ad..794359cc429d 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1209,14 +1209,11 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls Section = "Bootstrap"; Key = "URE_MORE_JAVA_CLASSPATH_URLS"; Value = ""; -#ifdef SYSTEM_BSH - ValueList1 = BSH_JAR; -#endif #ifdef SYSTEM_HSQLDB - ValueList2 = HSQLDB_JAR; + ValueList1 = HSQLDB_JAR; #endif #ifdef SYSTEM_SAXON - ValueList3 = SAXON_JAR; + ValueList2 = SAXON_JAR; #endif End diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a8e0d88ebc47..b53c69dee678 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -391,12 +391,6 @@ End #endif #ifdef SOLAR_JAVA -#ifndef SYSTEM_BSH -STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) -#endif -#endif - -#ifdef SOLAR_JAVA #ifndef SYSTEM_LUCENE STD_JAR_FILE( gid_File_Jar_Lucene_Core, lucene-core-2.3 ) STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 ) diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index ce2ab526fb22..bf17b8485694 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -184,10 +184,6 @@ SCPDEFS+=\ -DREDLAND_MAJOR=$(REDLAND_MAJOR) .ENDIF -.IF "$(SYSTEM_BSH)" == "YES" -SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\" -.ENDIF - .IF "$(SYSTEM_HSQLDB)" == "YES" SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\" .ENDIF diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 20d9b166fcef..cc080b5faa68 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -148,7 +148,6 @@ Module gid_Module_Root_Files_3 gid_File_Jar_Scriptframework, gid_File_Jar_Scriptproviderforjava, gid_File_Jar_Xml_Apis, - gid_File_Jar_Bsh, gid_File_Jar_Classes, gid_File_Jar_Xsltfilter, gid_File_Jar_Xsltvalidate, diff --git a/scripting/Extension_ScriptProviderForBeanShell.mk b/scripting/Extension_ScriptProviderForBeanShell.mk deleted file mode 100644 index a70322986551..000000000000 --- a/scripting/Extension_ScriptProviderForBeanShell.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Matúš Kukan <matus.kukan@gmail.com> -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Extension_Extension,script-provider-for-beanshell,scripting/util/provider/beanshell)) - -$(eval $(call gb_Extension_add_file,script-provider-for-beanshell,ScriptProviderForBeanShell.jar,\ - $(call gb_Jar_get_target,ScriptProviderForBeanShell))) - -# vim: set noet sw=4 ts=4: diff --git a/scripting/Extension_ScriptProviderForJavaScript.mk b/scripting/Extension_ScriptProviderForJavaScript.mk deleted file mode 100644 index daebae9211a7..000000000000 --- a/scripting/Extension_ScriptProviderForJavaScript.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Matúš Kukan <matus.kukan@gmail.com> -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Extension_Extension,script-provider-for-javascript,scripting/util/provider/javascript)) - -$(eval $(call gb_Extension_add_file,script-provider-for-javascript,ScriptProviderForJavaScript.jar,\ - $(call gb_Jar_get_target,ScriptProviderForJavaScript))) - -# vim: set noet sw=4 ts=4: diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index ef064ae7171e..753ea101546a 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -39,12 +39,20 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\ bsh \ )) + +$(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF)) + +#TODO: Ensure "file://$(BSH_JAR)" is a proper file URL: ifeq ($(SYSTEM_BSH),YES) -$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell,\ - $(BSH_JAR) \ -)) +$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ + unoil.jar ScriptFramework.jar file://$(BSH_JAR))) +else +$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ + unoil.jar ScriptFramework.jar bsh.jar)) endif +$(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO)) + $(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com)) $(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForBeanShell,\ diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk index 93ab3e10f315..5f690858ec16 100644 --- a/scripting/Jar_ScriptProviderForJavaScript.mk +++ b/scripting/Jar_ScriptProviderForJavaScript.mk @@ -37,6 +37,13 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForJavaScript,\ $(OUTDIR)/bin/js.jar \ )) +$(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF)) + +$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJavaScript, \ + unoil.jar ScriptFramework.jar js.jar)) + +$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO)) + $(eval $(call gb_Jar_set_packageroot,ScriptProviderForJavaScript,com)) $(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForJavaScript,\ diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk index b926b079e87b..252a1dfaad8f 100644 --- a/scripting/Module_scripting.mk +++ b/scripting/Module_scripting.mk @@ -30,17 +30,15 @@ $(eval $(call gb_Module_Module,scripting)) $(eval $(call gb_Module_add_targets,scripting,\ $(if $(SOLAR_JAVA),\ - $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\ - Extension_ScriptProviderForJavaScript) \ - $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\ - Extension_ScriptProviderForBeanShell) \ Jar_HelloWorld \ Jar_Highlight \ Jar_MemoryUsage \ Jar_ScriptFramework \ - Jar_ScriptProviderForBeanShell \ + $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\ + Jar_ScriptProviderForBeanShell) \ Jar_ScriptProviderForJava \ - Jar_ScriptProviderForJavaScript \ + $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\ + Jar_ScriptProviderForJavaScript) \ Zip_ScriptsJava \ ) \ $(if $(filter $(ENABLE_SCRIPTING_PYTHON),YES),\ diff --git a/scripting/java/ScriptProviderForBeanShell.component b/scripting/java/ScriptProviderForBeanShell.component new file mode 100644 index 000000000000..fe040d71d90d --- /dev/null +++ b/scripting/java/ScriptProviderForBeanShell.component @@ -0,0 +1,37 @@ +<?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 new file mode 100644 index 000000000000..e9725d865983 --- /dev/null +++ b/scripting/java/ScriptProviderForJavaScript.component @@ -0,0 +1,37 @@ +<?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/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF b/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF new file mode 100644 index 000000000000..689b6fde958f --- /dev/null +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF @@ -0,0 +1,2 @@ +RegistrationClassName: com.sun.star.script.framework.provider.beanshell.ScriptProviderForBeanShell +UNO-Type-Path: diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java index d3a0fdf3bc82..95c727881427 100755 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java @@ -123,41 +123,6 @@ public class ScriptProviderForBeanShell return xSingleServiceFactory; } - - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * - * @param regKey the registryKey - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) - { - String impl = "com.sun.star.script.framework.provider.beanshell." + - "ScriptProviderForBeanShell$_ScriptProviderForBeanShell"; - - String service1 = "com.sun.star.script.provider." + - "ScriptProvider"; - String service2 = "com.sun.star.script.provider." + - "LanguageScriptProvider"; - String service3 = "com.sun.star.script.provider." + - "ScriptProviderForBeanShell"; - String service4 = "com.sun.star.script.browse." + - "BrowseNode"; - - if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) ) - { - return true; - } - return false; - } - } class ScriptImpl implements XScript diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF b/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF new file mode 100644 index 000000000000..fe2f543c028b --- /dev/null +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF @@ -0,0 +1,2 @@ +RegistrationClassName: com.sun.star.script.framework.provider.javascript.ScriptProviderForJavaScript +UNO-Type-Path: diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java index c053b4166063..9f04d9105374 100755 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java @@ -124,40 +124,6 @@ public class ScriptProviderForJavaScript return xSingleServiceFactory; } - - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * - * @param regKey the registryKey - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader - */ - public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) - { - String impl = "com.sun.star.script.framework.provider.javascript." + - "ScriptProviderForJavaScript$_ScriptProviderForJavaScript"; - - String service1 = "com.sun.star.script.provider." + - "ScriptProvider"; - String service2 = "com.sun.star.script.provider." + - "LanguageScriptProvider"; - String service3 = "com.sun.star.script.provider." + - "ScriptProviderForJavaScript"; - String service4 = "com.sun.star.script.browse." + - "BrowseNode"; - - if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) && - FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) ) - { - return true; - } - return false; - } } class ScriptImpl implements XScript { 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> |