72d0bbd
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
72d0bbd
index d052261..0eb090c 100644
72d0bbd
--- a/scp2/source/ooo/file_ooo.scp
72d0bbd
+++ b/scp2/source/ooo/file_ooo.scp
72d0bbd
@@ -453,10 +453,6 @@ UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
72d0bbd
 #endif
72d0bbd
 
72d0bbd
 #ifdef SOLAR_JAVA
72d0bbd
-STD_JAR_FILE( gid_File_Jar_Js, js )
72d0bbd
-#endif
72d0bbd
-
72d0bbd
-#ifdef SOLAR_JAVA
72d0bbd
 
72d0bbd
 #ifndef MACOSX
72d0bbd
 
72d0bbd
@@ -501,9 +497,7 @@ End
72d0bbd
 
72d0bbd
 #ifdef SOLAR_JAVA
72d0bbd
 UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
72d0bbd
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
72d0bbd
 UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
72d0bbd
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
72d0bbd
 #endif
72d0bbd
 
72d0bbd
 #ifdef SOLAR_JAVA
72d0bbd
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
72d0bbd
index 5ffe87a..4a4b2ff 100644
72d0bbd
--- a/scp2/source/ooo/module_hidden_ooo.scp
72d0bbd
+++ b/scp2/source/ooo/module_hidden_ooo.scp
72d0bbd
@@ -91,7 +91,6 @@ Module gid_Module_Root_Files_3
72d0bbd
 	gid_File_Jar_Hsqldb,
72d0bbd
 	gid_File_Jar_Hsqldb_Sdbc,
72d0bbd
 	gid_File_Jar_Accessbridge,
72d0bbd
-	gid_File_Jar_Js,
72d0bbd
 	gid_File_Jar_Officebean,
72d0bbd
 	gid_File_Jar_Report,
72d0bbd
 	gid_File_Jar_Table,
72d0bbd
@@ -104,9 +103,7 @@ Module gid_Module_Root_Files_3
72d0bbd
 	gid_File_Jar_Commonwizards,
72d0bbd
 	gid_File_Jar_Sandbox,
72d0bbd
 	gid_File_Jar_Scriptframework,
72d0bbd
-	gid_File_Jar_Scriptproviderforbeanshell,
72d0bbd
 	gid_File_Jar_Scriptproviderforjava,
72d0bbd
-	gid_File_Jar_Scriptproviderforjavascript,
72d0bbd
 	gid_File_Jar_Xml_Apis,
72d0bbd
 	gid_File_Jar_Bsh,
72d0bbd
 	gid_File_Jar_Classes,
72d0bbd
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
72d0bbd
index e586876..0876b53 100644
72d0bbd
--- a/scp2/source/python/file_python.scp
72d0bbd
+++ b/scp2/source/python/file_python.scp
bad44c9
@@ -104,18 +104,6 @@
72d0bbd
 #endif
72d0bbd
 #endif
72d0bbd
 
72d0bbd
-// Scripting Framework Python script proxy
72d0bbd
-
bad44c9
-#ifndef AIX
72d0bbd
-File gid_File_Py_Pythonscript
72d0bbd
-    TXT_FILE_BODY;
72d0bbd
-    Dir = gid_Dir_Program;
72d0bbd
-    Name = "pythonscript.py";
72d0bbd
-    RegistryID = gid_Starregistry_Services_Rdb;
72d0bbd
-    Styles = (PACKED,UNO_COMPONENT);
72d0bbd
-End
bad44c9
-#endif
72d0bbd
- 
72d0bbd
 //Scripting Framework Python example scripts
72d0bbd
 
72d0bbd
 File gid_File_Scripts_Python
72d0bbd
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
72d0bbd
index 3abeec2..d32f6f6 100644
72d0bbd
--- a/scp2/source/python/module_python.scp
72d0bbd
+++ b/scp2/source/python/module_python.scp
72d0bbd
@@ -32,7 +32,7 @@ Module gid_Module_Optional_Pyuno
72d0bbd
     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
72d0bbd
     ParentID = gid_Module_Optional;
72d0bbd
     Sortkey = "750";
72d0bbd
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
72d0bbd
+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
72d0bbd
     Minimal = NO;
72d0bbd
     Default = YES;
72d0bbd
     Styles = ( );
72d0bbd
diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst
72d0bbd
index 7d51621..81a8512 100755
72d0bbd
--- a/scripting/prj/build.lst
72d0bbd
+++ b/scripting/prj/build.lst
72d0bbd
@@ -12,3 +12,5 @@ tc	scripting\java						nmake	-	all	tc1_scriptingjava tc1_scriptingprovider tc1_s
72d0bbd
 tc	scripting\examples\java				nmake	-	all	tc1_scriptingexamplesjava tc1_scriptingjava  NULL
72d0bbd
 tc	scripting\examples				nmake	-	all	tc1_scriptingexamples tc1_scriptingexamplesjava  tc1_inc NULL
72d0bbd
 tc	scripting\util						nmake	-	all	tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingvbaevents tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL
72d0bbd
+tc  scripting\util\provider\javascript  nmake   -   all tc1_scriptingjsprov tc1_scriptingjava NULL
72d0bbd
+tc  scripting\util\provider\beanshell   nmake   -   all tc1_scriptingbshprov tc1_scriptingjava NULL
72d0bbd
diff --git a/scripting/prj/d.lst b/scripting/prj/d.lst
72d0bbd
index ef216fe..30d5e1c 100644
72d0bbd
--- a/scripting/prj/d.lst
72d0bbd
+++ b/scripting/prj/d.lst
72d0bbd
@@ -15,3 +15,6 @@ mkdir: %_DEST%\bin%_EXT%\pyuno
72d0bbd
 ..\source\storage\storage.xml %_DEST%\xml%_EXT%\storage.xml
72d0bbd
 
72d0bbd
 ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
72d0bbd
+
72d0bbd
+# Extensions
72d0bbd
+..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
72d0bbd
diff --git a/scripting/source/pyprov/description.xml b/scripting/source/pyprov/description.xml
72d0bbd
new file mode 100644
72d0bbd
index 0000000..1fe0a3d
72d0bbd
--- /dev/null
72d0bbd
+++ b/scripting/source/pyprov/description.xml
72d0bbd
@@ -0,0 +1,24 @@
72d0bbd
+
72d0bbd
+
72d0bbd
+  xmlns="http://openoffice.org/extensions/description/2006"
72d0bbd
+  xmlns:xlink="http://www.w3.org/1999/xlink"
72d0bbd
+  xmlns:dep="http://openoffice.org/extensions/description/2006">
72d0bbd
+
72d0bbd
+  <identifier value="com.sun.star.script.provider.ScriptProviderForPython"/>
72d0bbd
+
72d0bbd
+  <dependencies>
72d0bbd
+    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
72d0bbd
+  </dependencies>
72d0bbd
+
72d0bbd
+  <version value="3.3.0"/>
72d0bbd
+
72d0bbd
+  <publisher>
72d0bbd
+    <name xlink:href="http://www.documentfoundation.org" lang="en">The
72d0bbd
+      Document Foundation</name>
72d0bbd
+  </publisher>
72d0bbd
+
72d0bbd
+  <display-name>
72d0bbd
+    <name lang="en">Script provider for Python</name>
72d0bbd
+  </display-name>
72d0bbd
+
72d0bbd
+</description>
72d0bbd
diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
72d0bbd
index 3c02785..2a63d9f 100644
72d0bbd
--- a/scripting/source/pyprov/makefile.mk
72d0bbd
+++ b/scripting/source/pyprov/makefile.mk
72d0bbd
@@ -39,11 +39,26 @@ TARGET=pyprov
72d0bbd
 
72d0bbd
 # --- Targets ------------------------------------------------------
72d0bbd
 ALL : ALLTAR \
72d0bbd
-        $(DLLDEST)$/pythonscript.py	\
72d0bbd
     $(DLLDEST)$/officehelper.py	\
72d0bbd
         $(DLLDEST)$/mailmerge.py
72d0bbd
 
72d0bbd
 $(DLLDEST)$/%.py: %.py
72d0bbd
     cp $? $@
72d0bbd
 
72d0bbd
-.INCLUDE :  target.mk
72d0bbd
+# scripting provider extension
72d0bbd
+.IF "$(L10N_framework)"==""
72d0bbd
+
72d0bbd
+EXTENSIONNAME:=ScriptProviderForPython
72d0bbd
+EXTENSION_ZIPNAME:=script-provider-for-python
72d0bbd
+
72d0bbd
+COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py
72d0bbd
+
72d0bbd
+.INCLUDE : extension_pre.mk
72d0bbd
+.INCLUDE : target.mk
72d0bbd
+.INCLUDE : extension_post.mk
72d0bbd
+
72d0bbd
+.ELSE
72d0bbd
+
72d0bbd
+.INCLUDE : target.mk
72d0bbd
+
72d0bbd
+.ENDIF
72d0bbd
diff --git a/scripting/source/pyprov/manifest.xml b/scripting/source/pyprov/manifest.xml
72d0bbd
new file mode 100644
72d0bbd
index 0000000..7e4e045
72d0bbd
--- /dev/null
72d0bbd
+++ b/scripting/source/pyprov/manifest.xml
72d0bbd
@@ -0,0 +1,7 @@
72d0bbd
+
72d0bbd
+
72d0bbd
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
72d0bbd
+  
72d0bbd
+    manifest:media-type="application/vnd.sun.star.uno-component;type=python"
72d0bbd
+    manifest:full-path="pythonscript.py"/>
72d0bbd
+</manifest:manifest>
72d0bbd
diff --git a/scripting/util/provider/beanshell/description.xml b/scripting/util/provider/beanshell/description.xml
72d0bbd
new file mode 100644
72d0bbd
index 0000000..6b05318
72d0bbd
--- /dev/null
72d0bbd
+++ b/scripting/util/provider/beanshell/description.xml
72d0bbd
@@ -0,0 +1,24 @@
72d0bbd
+
72d0bbd
+
72d0bbd
+  xmlns="http://openoffice.org/extensions/description/2006"
72d0bbd
+  xmlns:xlink="http://www.w3.org/1999/xlink"
72d0bbd
+  xmlns:dep="http://openoffice.org/extensions/description/2006">
72d0bbd
+
72d0bbd
+  <identifier value="com.sun.star.script.provider.ScriptProviderForBeanShell"/>
72d0bbd
+
72d0bbd
+  <dependencies>
72d0bbd
+    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
72d0bbd
+  </dependencies>
72d0bbd
+
72d0bbd
+  <version value="3.3.0"/>
72d0bbd
+
72d0bbd
+  <publisher>
72d0bbd
+    <name xlink:href="http://www.documentfoundation.org" lang="en">The
72d0bbd
+      Document Foundation</name>
72d0bbd
+  </publisher>
72d0bbd
+
72d0bbd
+  <display-name>
72d0bbd
+    <name lang="en">Script provider for BeanShell</name>
72d0bbd
+  </display-name>
72d0bbd
+
72d0bbd
+</description>
72d0bbd
diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk
72d0bbd
new file mode 100644
72d0bbd
index 0000000..7e16329
72d0bbd
--- /dev/null
72d0bbd
+++ b/scripting/util/provider/beanshell/makefile.mk
72d0bbd
@@ -0,0 +1,48 @@
72d0bbd
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
72d0bbd
+#
72d0bbd
+# The contents of this file are subject to the Mozilla Public License Version
72d0bbd
+# 1.1 (the "License"); you may not use this file except in compliance with
72d0bbd
+# the License. You may obtain a copy of the License at
72d0bbd
+# http://www.mozilla.org/MPL/
72d0bbd
+#
72d0bbd
+# Software distributed under the License is distributed on an "AS IS" basis,
72d0bbd
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
72d0bbd
+# for the specific language governing rights and limitations under the
72d0bbd
+# License.
72d0bbd
+#
72d0bbd
+# The Initial Developer of the Original Code is
72d0bbd
+#       Red Hat, Inc.
72d0bbd
+# Portions created by the Initial Developer are Copyright (C) 2010 the
72d0bbd
+# Initial Developer. All Rights Reserved.
72d0bbd
+#
72d0bbd
+# Contributor(s): David Tardon <dtardon@redhat.com>
72d0bbd
+#
72d0bbd
+# Alternatively, the contents of this file may be used under the terms of
72d0bbd
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
72d0bbd
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
72d0bbd
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
72d0bbd
+# instead of those above.
72d0bbd
+
72d0bbd
+PRJ=..$/..$/..
72d0bbd
+
72d0bbd
+PRJNAME=scripting
72d0bbd
+TARGET=bshprov
72d0bbd
+
72d0bbd
+.INCLUDE : settings.mk
72d0bbd
+
72d0bbd
+.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!=""
72d0bbd
+
72d0bbd
+EXTENSIONNAME:=ScriptProviderForBeanShell
72d0bbd
+EXTENSION_ZIPNAME:=script-provider-for-beanshell
72d0bbd
+
72d0bbd
+COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
72d0bbd
+
72d0bbd
+.INCLUDE : extension_pre.mk
72d0bbd
+.INCLUDE : target.mk
72d0bbd
+.INCLUDE : extension_post.mk
72d0bbd
+
72d0bbd
+.ELSE
72d0bbd
+
72d0bbd
+.INCLUDE : target.mk
72d0bbd
+
72d0bbd
+.ENDIF
72d0bbd
diff --git a/scripting/util/provider/beanshell/manifest.xml b/scripting/util/provider/beanshell/manifest.xml
72d0bbd
new file mode 100644
72d0bbd
index 0000000..da8e620
72d0bbd
--- /dev/null
72d0bbd
+++ b/scripting/util/provider/beanshell/manifest.xml
72d0bbd
@@ -0,0 +1,7 @@
72d0bbd
+
72d0bbd
+
72d0bbd
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
72d0bbd
+  
72d0bbd
+    manifest:media-type="application/vnd.sun.star.uno-component;type=java"
72d0bbd
+    manifest:full-path="ScriptProviderForBeanShell.jar"/>
72d0bbd
+</manifest:manifest>
72d0bbd
diff --git a/scripting/util/provider/javascript/description.xml b/scripting/util/provider/javascript/description.xml
72d0bbd
new file mode 100644
72d0bbd
index 0000000..58f0478
72d0bbd
--- /dev/null
72d0bbd
+++ b/scripting/util/provider/javascript/description.xml
72d0bbd
@@ -0,0 +1,24 @@
72d0bbd
+
72d0bbd
+
72d0bbd
+  xmlns="http://openoffice.org/extensions/description/2006"
72d0bbd
+  xmlns:xlink="http://www.w3.org/1999/xlink"
72d0bbd
+  xmlns:dep="http://openoffice.org/extensions/description/2006">
72d0bbd
+
72d0bbd
+  <identifier value="com.sun.star.script.provider.ScriptProviderForJavaScript"/>
72d0bbd
+
72d0bbd
+  <dependencies>
72d0bbd
+    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
72d0bbd
+  </dependencies>
72d0bbd
+
72d0bbd
+  <version value="3.3.0"/>
72d0bbd
+
72d0bbd
+  <publisher>
72d0bbd
+    <name xlink:href="http://www.documentfoundation.org" lang="en">The
72d0bbd
+      Document Foundation</name>
72d0bbd
+  </publisher>
72d0bbd
+
72d0bbd
+  <display-name>
72d0bbd
+    <name lang="en">Script provider for JavaScript</name>
72d0bbd
+  </display-name>
72d0bbd
+
72d0bbd
+</description>
72d0bbd
diff --git a/scripting/util/provider/javascript/makefile.mk b/scripting/util/provider/javascript/makefile.mk
72d0bbd
new file mode 100644
72d0bbd
index 0000000..a99096a
72d0bbd
--- /dev/null
72d0bbd
+++ b/scripting/util/provider/javascript/makefile.mk
72d0bbd
@@ -0,0 +1,55 @@
72d0bbd
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
72d0bbd
+#
72d0bbd
+# The contents of this file are subject to the Mozilla Public License Version
72d0bbd
+# 1.1 (the "License"); you may not use this file except in compliance with
72d0bbd
+# the License. You may obtain a copy of the License at
72d0bbd
+# http://www.mozilla.org/MPL/
72d0bbd
+#
72d0bbd
+# Software distributed under the License is distributed on an "AS IS" basis,
72d0bbd
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
72d0bbd
+# for the specific language governing rights and limitations under the
72d0bbd
+# License.
72d0bbd
+#
72d0bbd
+# The Initial Developer of the Original Code is
72d0bbd
+#       Red Hat, Inc.
72d0bbd
+# Portions created by the Initial Developer are Copyright (C) 2010 the
72d0bbd
+# Initial Developer. All Rights Reserved.
72d0bbd
+#
72d0bbd
+# Contributor(s): David Tardon <dtardon@redhat.com>
72d0bbd
+#
72d0bbd
+# Alternatively, the contents of this file may be used under the terms of
72d0bbd
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
72d0bbd
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
72d0bbd
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
72d0bbd
+# instead of those above.
72d0bbd
+
72d0bbd
+PRJ=..$/..$/..
72d0bbd
+
72d0bbd
+PRJNAME=scripting
72d0bbd
+TARGET=jsprov
72d0bbd
+
72d0bbd
+.INCLUDE : settings.mk
72d0bbd
+
72d0bbd
+.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!=""
72d0bbd
+
72d0bbd
+EXTENSIONNAME:=ScriptProviderForJavaScript
72d0bbd
+EXTENSION_ZIPNAME:=script-provider-for-javascript
72d0bbd
+
72d0bbd
+COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
72d0bbd
+EXTENSION_PACKDEPS=$(SOLARBINDIR)$/js.jar
72d0bbd
+
72d0bbd
+.INCLUDE : extension_pre.mk
72d0bbd
+.INCLUDE : target.mk
72d0bbd
+.INCLUDE : extension_post.mk
72d0bbd
+
72d0bbd
+ALLTAR : $(EXTENSIONDIR)$/js.jar
72d0bbd
+
72d0bbd
+$(EXTENSIONDIR)$/js.jar : $(SOLARBINDIR)$/js.jar
72d0bbd
+    @@-$(MKDIRHIER) $(@:d)
72d0bbd
+    $(COMMAND_ECHO)$(COPY) $< $@
72d0bbd
+
72d0bbd
+.ELSE
72d0bbd
+
72d0bbd
+.INCLUDE : target.mk
72d0bbd
+
72d0bbd
+.ENDIF
72d0bbd
diff --git a/scripting/util/provider/javascript/manifest.xml b/scripting/util/provider/javascript/manifest.xml
72d0bbd
new file mode 100644
72d0bbd
index 0000000..4c61747
72d0bbd
--- /dev/null
72d0bbd
+++ b/scripting/util/provider/javascript/manifest.xml
72d0bbd
@@ -0,0 +1,10 @@
72d0bbd
+
72d0bbd
+
72d0bbd
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
72d0bbd
+  
72d0bbd
+    manifest:media-type="application/vnd.sun.star.uno-component;type=java"
72d0bbd
+    manifest:full-path="js.jar"/>
72d0bbd
+  
72d0bbd
+    manifest:media-type="application/vnd.sun.star.uno-component;type=java"
72d0bbd
+    manifest:full-path="ScriptProviderForJavaScript.jar"/>
72d0bbd
+</manifest:manifest>
72d0bbd
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
72d0bbd
--- a/instsetoo_native/util/makefile.mk
72d0bbd
+++ b/instsetoo_native/util/makefile.mk
72d0bbd
@@ -72,7 +72,6 @@ LOCALPYFILES= \
72d0bbd
     $(BIN)$/uno.py \
72d0bbd
     $(BIN)$/unohelper.py \
72d0bbd
     $(BIN)$/pythonloader.py \
72d0bbd
-    $(BIN)$/pythonscript.py \
72d0bbd
     $(BIN)$/officehelper.py \
72d0bbd
     $(BIN)$/mailmerge.py
72d0bbd