finished converting scripting to gbuild

40 files changed, 473 insertions, 1396 deletions

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 9a3eef94b9d9..f3fe6a1edfa6 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -249,11 +249,11 @@ my_components += component/framework/util/lomenubar
 .IF "$(SOLAR_JAVA)" == "TRUE"
 my_components += \
     LuceneHelpWrapper \
-    ScriptFramework \
-    ScriptProviderForJava \
     XMergeBridge \
     component/filter/source/xsltfilter/XSLTFilter.jar \
     component/filter/source/xsltvalidate/XSLTValidate \
+    component/scripting/java/ScriptFramework \
+    component/scripting/java/ScriptProviderForJava \
     component/wizards/com/sun/star/wizards/agenda/agenda \
     component/wizards/com/sun/star/wizards/fax/fax \
     component/wizards/com/sun/star/wizards/form/form \
@@ -367,7 +367,7 @@ my_components += evoab
 my_components += component/avmedia/source/gstreamer/avmediagstreamer
 .END
 
-my_ooo_components = mailmerge
+my_ooo_components = component/scripting/source/pyprov/mailmerge
 
 .INCLUDE: target.mk
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ec58f59de245..22a19a373a7c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -46,9 +46,9 @@ File gid_File_Lib_Basprov
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(basprov,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(basprov,.uno,.dll));
   #endif
 End
 
@@ -57,9 +57,9 @@ File gid_File_Lib_Vbaevent
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(vbaevents,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(vbaevents,.uno,.dll));
   #endif
 End
 
@@ -320,9 +320,9 @@ File gid_File_Lib_Dlgprov
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(dlgprov,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(dlgprov,.uno,.dll));
   #endif
 End
 
@@ -331,9 +331,9 @@ File gid_File_Lib_Stringresource
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(stringresource,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(stringresource,.uno,.dll));
   #endif
 End
 
diff --git a/scripting/Extension_ScriptProviderForBeanShell.mk b/scripting/Extension_ScriptProviderForBeanShell.mk
new file mode 100644
index 000000000000..a70322986551
--- /dev/null
+++ b/scripting/Extension_ScriptProviderForBeanShell.mk
@@ -0,0 +1,34 @@
+# -*- 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
new file mode 100644
index 000000000000..daebae9211a7
--- /dev/null
+++ b/scripting/Extension_ScriptProviderForJavaScript.mk
@@ -0,0 +1,34 @@
+# -*- 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/Zip_pythonscript.mk b/scripting/Extension_ScriptProviderForPython.mk
index 68ce8660136a..08d3cc724205 100644
--- a/scripting/Zip_pythonscript.mk
+++ b/scripting/Extension_ScriptProviderForPython.mk
@@ -26,11 +26,9 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Zip_Zip,pythonscript,$(SRCDIR)/scripting/source/pyprov))
+$(eval $(call gb_Extension_Extension,script-provider-for-python,scripting/source/pyprov))
 
-$(eval $(call gb_Zip_add_files,pythonscript,\
-	description.xml \
-	pythonscript.py \
-))
+$(eval $(call gb_Extension_add_file,script-provider-for-python,pythonscript.py,\
+	$(SRCDIR)/scripting/source/pyprov/pythonscript.py))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/util/provider/javascript/makefile.mk b/scripting/Jar_HelloWorld.mk
index f6443ad577aa..bbd71a0c64cd 100755..100644
--- a/scripting/util/provider/javascript/makefile.mk
+++ b/scripting/Jar_HelloWorld.mk
@@ -1,9 +1,10 @@
+# -*- 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. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# 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
@@ -11,11 +12,13 @@
 # License.
 #
 # The Initial Developer of the Original Code is
-#       Red Hat, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
+#       Matúš Kukan <matus.kukan@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
 # Initial Developer. All Rights Reserved.
 #
-# Contributor(s): David Tardon <dtardon@redhat.com>
+# 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
@@ -23,38 +26,17 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-PRJ=..$/..$/..
-
-PRJNAME=scripting
-TARGET=jsprov
-
-.INCLUDE : settings.mk
-
-.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!=""
-
-EXTENSIONNAME:=ScriptProviderForJavaScript
-EXTENSION_ZIPNAME:=script-provider-for-javascript
-
-COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
-EXTENSION_PACKDEPS=$(SOLARBINDIR)$/js.jar
-
-.IF "$(ENABLE_SCRIPTING_JAVASCRIPT)" != "YES"
-@all:
-    @echo "Script Provider for JavaScript build disabled."
-.ENDIF
-
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-ALLTAR : $(EXTENSIONDIR)$/js.jar
-
-$(EXTENSIONDIR)$/js.jar : $(SOLARBINDIR)$/js.jar
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
+$(eval $(call gb_Jar_Jar,HelloWorld,SRCDIR))
 
-.ELSE
+$(eval $(call gb_Jar_add_jars,HelloWorld,\
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+))
 
-.INCLUDE : target.mk
+$(eval $(call gb_Jar_add_sourcefiles,HelloWorld,\
+	scripting/examples/java/HelloWorld/HelloWorld \
+))
 
-.ENDIF
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk
new file mode 100644
index 000000000000..018b6f874a06
--- /dev/null
+++ b/scripting/Jar_Highlight.mk
@@ -0,0 +1,42 @@
+# -*- 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_Jar_Jar,Highlight,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,Highlight,\
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,Highlight,\
+	scripting/examples/java/Highlight/HighlightText \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk
new file mode 100644
index 000000000000..eb1a476fe608
--- /dev/null
+++ b/scripting/Jar_MemoryUsage.mk
@@ -0,0 +1,42 @@
+# -*- 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_Jar_Jar,MemoryUsage,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,MemoryUsage,\
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,MemoryUsage,\
+	scripting/examples/java/MemoryUsage/MemoryUsage \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
new file mode 100644
index 000000000000..b95606e83b6f
--- /dev/null
+++ b/scripting/Jar_ScriptFramework.mk
@@ -0,0 +1,75 @@
+# -*- 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_Jar_Jar,ScriptFramework,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,ScriptFramework,\
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO))
+
+$(eval $(call gb_Jar_set_packageroot,ScriptFramework,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,ScriptFramework,\
+	scripting/java/com/sun/star/script/framework/browse/DialogFactory \
+	scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode \
+	scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode \
+	scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode \
+	scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode \
+	scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB \
+	scripting/java/com/sun/star/script/framework/container/ParcelContainer \
+	scripting/java/com/sun/star/script/framework/container/ParcelDescriptor \
+	scripting/java/com/sun/star/script/framework/container/Parcel \
+	scripting/java/com/sun/star/script/framework/container/ParsedScriptUri \
+	scripting/java/com/sun/star/script/framework/container/ScriptEntry \
+	scripting/java/com/sun/star/script/framework/container/ScriptMetaData \
+	scripting/java/com/sun/star/script/framework/container/UnoPkgContainer \
+	scripting/java/com/sun/star/script/framework/container/XMLParserFactory \
+	scripting/java/com/sun/star/script/framework/container/XMLParser \
+	scripting/java/com/sun/star/script/framework/io/UCBStreamHandler \
+	scripting/java/com/sun/star/script/framework/io/XInputStreamImpl \
+	scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper \
+	scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper \
+	scripting/java/com/sun/star/script/framework/io/XStorageHelper \
+	scripting/java/com/sun/star/script/framework/log/LogUtils \
+	scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory \
+	scripting/java/com/sun/star/script/framework/provider/EditorScriptContext \
+	scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException \
+	scripting/java/com/sun/star/script/framework/provider/PathUtils \
+	scripting/java/com/sun/star/script/framework/provider/ScriptContext \
+	scripting/java/com/sun/star/script/framework/provider/ScriptEditor \
+	scripting/java/com/sun/star/script/framework/provider/ScriptProvider \
+	scripting/java/com/sun/star/script/framework/provider/SwingInvocation \
+	scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
new file mode 100644
index 000000000000..87e2cb933a50
--- /dev/null
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -0,0 +1,55 @@
+# -*- 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_Jar_Jar,ScriptProviderForBeanShell,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/ScriptFramework.jar \
+	$(OUTDIR)/bin/bsh.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForBeanShell,\
+	scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView \
+	scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell \
+	scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell \
+	scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel \
+	scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView \
+))
+
+$(eval $(call gb_Jar_add_packagefile,ScriptProviderForBeanShell,\
+	com/sun/star/script/framework/provider/beanshell/template.bsh,\
+		$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
new file mode 100644
index 000000000000..8e7d2bfc9d43
--- /dev/null
+++ b/scripting/Jar_ScriptProviderForJava.mk
@@ -0,0 +1,51 @@
+# -*- 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_Jar_Jar,ScriptProviderForJava,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,ScriptProviderForJava,\
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/ScriptFramework.jar \
+))
+
+$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJava,scripting/java/ScriptProviderForJava,OOO))
+
+$(eval $(call gb_Jar_set_packageroot,ScriptProviderForJava,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForJava,\
+	scripting/java/com/sun/star/script/framework/provider/java/Resolver \
+	scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor \
+	scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava \
+	scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy \
+	scripting/java/com/sun/star/script/framework/provider/java/StrictResolver \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
new file mode 100644
index 000000000000..91d97fbe50a6
--- /dev/null
+++ b/scripting/Jar_ScriptProviderForJavaScript.mk
@@ -0,0 +1,52 @@
+# -*- 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_Jar_Jar,ScriptProviderForJavaScript,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,ScriptProviderForJavaScript,\
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/ScriptFramework.jar \
+	$(OUTDIR)/bin/js.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,ScriptProviderForJavaScript,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForJavaScript,\
+	scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript \
+	scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript \
+))
+
+$(eval $(call gb_Jar_add_packagefile,ScriptProviderForJavaScript,\
+	com/sun/star/script/framework/provider/javascript/template.js,\
+		$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/template.js \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index bbaa4859b789..b926b079e87b 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -29,6 +29,22 @@
 $(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 \
+		Jar_ScriptProviderForJava \
+		Jar_ScriptProviderForJavaScript \
+		Zip_ScriptsJava \
+	) \
+	$(if $(filter $(ENABLE_SCRIPTING_PYTHON),YES),\
+		Extension_ScriptProviderForPython) \
 	Library_basprov \
 	Library_dlgprov \
 	Library_protocolhandler \
@@ -41,7 +57,5 @@ $(eval $(call gb_Module_add_targets,scripting,\
 	Zip_ScriptsJavaScript \
 	Zip_ScriptsPython \
 ))
-#	TODO:
-#	$(if $(SOLAR_JAVA),Zip_ScriptsJava) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/Zip_ScriptsJava.mk b/scripting/Zip_ScriptsJava.mk
index c3cb31bee81d..247ad159a5d1 100644
--- a/scripting/Zip_ScriptsJava.mk
+++ b/scripting/Zip_ScriptsJava.mk
@@ -26,19 +26,44 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-# first we need to convert examples/java/makefile.mk
-#$(eval $(call gb_Zip_Zip,ScriptsJava,$(WORKDIR)/...))
-
-#$(eval $(call gb_Zip_add_files,ScriptsJava,\
-	java/Highlight/Highlight.jar \
-	java/Highlight/HighlightText.java \
-	java/Highlight/parcel-descriptor.xml \
-	java/MemoryUsage/MemoryUsage.java \
-	java/MemoryUsage/parcel-descriptor.xml \
-	java/MemoryUsage/MemoryUsage.jar \
-	java/HelloWorld/HelloWorld.java \
-	java/HelloWorld/HelloWorld.jar \
-	java/HelloWorld/parcel-descriptor.xml \
+$(eval $(call gb_Zip_Zip,ScriptsJava,$(WORKDIR)/Zip/ScriptsJava))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/HelloWorld.jar,\
+	$(OUTDIR)/bin/HelloWorld.jar \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/HelloWorld.java,\
+	$(SRCDIR)/scripting/examples/java/HelloWorld/HelloWorld.java \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/parcel-descriptor.xml,\
+	$(SRCDIR)/scripting/examples/java/HelloWorld/parcel-descriptor.xml \
+))
+
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/Highlight.jar,\
+	$(OUTDIR)/bin/Highlight.jar \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/HighlightText.java,\
+	$(SRCDIR)/scripting/examples/java/Highlight/HighlightText.java \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/parcel-descriptor.xml,\
+	$(SRCDIR)/scripting/examples/java/Highlight/parcel-descriptor.xml \
+))
+
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/MemoryUsage.jar,\
+	$(OUTDIR)/bin/MemoryUsage.jar \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/MemoryUsage.java,\
+	$(SRCDIR)/scripting/examples/java/MemoryUsage/MemoryUsage.java \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/parcel-descriptor.xml,\
+	$(SRCDIR)/scripting/examples/java/MemoryUsage/parcel-descriptor.xml \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/examples/delzip b/scripting/examples/delzip
deleted file mode 100755
index 636fda90bfcb..000000000000
--- a/scripting/examples/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/scripting/examples/java/build.xml b/scripting/examples/java/build.xml
deleted file mode 100755
index cb399d6daccb..000000000000
--- a/scripting/examples/java/build.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<!--
-
-  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.
-
--->
-<project name="Scripting Framework Java Examples" default="all" basedir=".">
-  <!-- =================== Environmental Properties ======================= -->
-
-  <property name="prj" value="../.."/>
-  <property environment="env"/>
-  <property name="outdir" value="${out}/class/examples/java"/>
-
-  <!-- ==================== classpath setting ============================ -->
-  <path id="idlclasspath">
-    <pathelement location="${solar.jar}/unoil.jar"/>
-    <pathelement location="${solar.jar}/jurt.jar"/>
-    <pathelement location="${solar.jar}/juh.jar"/>
-    <pathelement location="${solar.jar}/ridl.jar"/>
-    <pathelement location="${out}/class/ScriptFramework.jar"/>
-  </path>
-
-  <!-- ===================== HelloWorld example =========================== -->
-  <target name="HelloWorld">
-
-    <mkdir dir="${outdir}/HelloWorld"/>
-
-    <javac srcdir="HelloWorld" destdir="${outdir}/HelloWorld"
-           includes="**/*.java" classpathref="idlclasspath"
-           debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/>
-
-    <copy file="HelloWorld/HelloWorld.java" todir="${outdir}/HelloWorld"/>
-    <copy file="HelloWorld/parcel-descriptor.xml" todir="${outdir}/HelloWorld"/>
-
-    <jar jarfile="${outdir}/HelloWorld/HelloWorld.jar"
-         basedir="${outdir}/HelloWorld"
-         includes="**/*.class"
-         excludes="${outdir}/HelloWorld/HelloWorld.jar">
-    </jar>
-
-    <delete file="${outdir}/HelloWorld/HelloWorld.class"/>
-
-  </target>
-
-  <!-- ===================== Highlight example ========================== -->
-  <target name="Highlight">
-
-    <mkdir dir="${outdir}/Highlight"/>
-
-    <javac srcdir="Highlight" destdir="${outdir}/Highlight"
-           includes="**/*.java" classpathref="idlclasspath"
-           debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/>
-
-    <copy file="Highlight/HighlightText.java" todir="${outdir}/Highlight"/>
-    <copy file="Highlight/parcel-descriptor.xml" todir="${outdir}/Highlight"/>
-
-    <jar jarfile="${outdir}/Highlight/Highlight.jar"
-         basedir="${outdir}/Highlight"
-         includes="**/*.class"
-         excludes="${outdir}/Highlight/Highlight.jar">
-    </jar>
-
-    <delete file="${outdir}/Highlight/HighlightText.class"/>
-
-  </target>
-
-  <!-- ===================== MemoryUsage example ========================== -->
-  <target name="MemoryUsage">
-
-    <mkdir dir="${outdir}/MemoryUsage"/>
-
-    <javac srcdir="MemoryUsage" destdir="${outdir}/MemoryUsage"
-           includes="**/*.java" classpathref="idlclasspath"
-           debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/>
-
-    <copy file="MemoryUsage/MemoryUsage.java" todir="${outdir}/MemoryUsage"/>
-    <copy file="MemoryUsage/parcel-descriptor.xml" todir="${outdir}/MemoryUsage"/>
-
-    <jar jarfile="${outdir}/MemoryUsage/MemoryUsage.jar"
-         basedir="${outdir}/MemoryUsage"
-         includes="**/*.class"
-         excludes="${outdir}/MemoryUsage/MemoryUsage.jar">
-    </jar>
-
-    <delete file="${outdir}/MemoryUsage/MemoryUsage.class"/>
-
-  </target>
-
-  <!-- ===================== selector example ========================== -->
-  <target name="selector">
-
-    <mkdir dir="${outdir}/selector"/>
-
-    <javac srcdir="selector" destdir="${outdir}/selector"
-              includes="**/*.java" classpathref="idlclasspath"
-           debug="${debug}" optimize="${optimize}" deprecation="on"/>
-
-    <copy todir="${outdir}/selector">
-        <fileset dir="selector">
-            <include name="**/*.java"/>
-            <include name="*.xml"/>
-            <include name="*.gif"/>
-        </fileset>
-    </copy>
-
-    <jar jarfile="${outdir}/selector/selector.jar"
-         basedir="${outdir}/selector" includes="*.class,*.gif">
-    </jar>
-
-    <delete>
-        <fileset dir="${outdir}/selector" includes="*.class,*.gif"/>
-    </delete>
-
-  </target>
-
-  <!-- ========================= All In One Build ======================= -->
-  <target name="all" depends="HelloWorld,Highlight,MemoryUsage"/>
-
-</project>
diff --git a/scripting/examples/java/makefile.mk b/scripting/examples/java/makefile.mk
deleted file mode 100755
index 06ba88868c8f..000000000000
--- a/scripting/examples/java/makefile.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=scripting
-TARGET=javaexamples
-
-.INCLUDE : ant.mk
-
-.IF "$(SOLAR_JAVA)"!=""
-.IF "$(L10N_framework)"==""
-ALLTAR : ANTBUILD
-.ENDIF
-.ENDIF
diff --git a/scripting/examples/makefile.mk b/scripting/examples/makefile.mk
deleted file mode 100755
index 577547cca875..000000000000
--- a/scripting/examples/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..
-PRJNAME=scriptinginstaller
-TARGET=scriptinginstaller
-no_common_build_zip=true
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)"!=""
-ZIP1FLAGS=-r
-ZIP1TARGET=ScriptsJava
-ZIP1DIR=$(OUT)$/class$/examples
-ZIP1LIST=java
-.ENDIF
-
-ZIP2FLAGS=-r
-ZIP2TARGET=ScriptsBeanShell
-ZIP2LIST=beanshell/HelloWorld beanshell/Highlight beanshell/WordCount beanshell/Capitalise beanshell/MemoryUsage 
-
-ZIP3FLAGS=-r
-ZIP3TARGET=ScriptsJavaScript
-ZIP3LIST=javascript
-
-ZIP4FLAGS=-r
-ZIP4TARGET=ScriptsPython
-ZIP4LIST=python/HelloWorld.py python/Capitalise.py python/pythonSamples
-
-ZIP5FLAGS=-r
-ZIP5TARGET=scriptbindinglib
-ZIP5DIR=$(PRJ)$/workben$/bindings
-ZIP5LIST=*.xlb Highlight.xdl
-.ENDIF
-.INCLUDE : target.mk
diff --git a/scripting/inc/makefile.mk b/scripting/inc/makefile.mk
deleted file mode 100755
index 1d23c96ac79d..000000000000
--- a/scripting/inc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=scripting
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/scripting/java/build.env b/scripting/java/build.env
deleted file mode 100755
index 5b055e0b8452..000000000000
--- a/scripting/java/build.env
+++ /dev/null
@@ -1,3 +0,0 @@
-jedit.install.dir=/scde/soperm/projects/scripting/build-dependencies
-install.dir=/scde/soperm/projects/scripting/build-dependencies
-netbeans.home=/scde/soperm/projects/scripting/build-dependencies
diff --git a/scripting/java/build.xml b/scripting/java/build.xml
deleted file mode 100755
index 2abb784a387e..000000000000
--- a/scripting/java/build.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<!--
-
-  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.
-
--->
-<project name="Scipting Framework" default="all" basedir=".">
-
-  <!-- =================== Environmental Properties ======================= -->
-
-  <property name="prj" value=".."/>
-  <property name="optimize"   value="off"/>
-  <property name="debug"   value="on"/>
-  <property name="jardir" value="${out}/class"/>
-  <property name="bindir" value="${out}/bin"/>
-  <property name="idesupport.dir" value="org/openoffice/idesupport"/>
-  <property name="netbeans.dir" value="org/openoffice/netbeans/modules/office"/>
-  <property name="framework.dir" value="Framework/com/sun/star/script/framework/security"/>
-
-  <!-- Change this property if you are building NetBeans editor support jar.
-       Not needed in default build -->
-  <property name="netbeans.install.path" value="/export/home/netbeans"/>
-
-  <property environment="env"/>
-  <property name="env.BSH_JAR" value="${solar.jar}/bsh.jar"/>
-
-  <!-- ==================== classpath setting ============================ -->
-  <path id="idlclasspath">
-    <pathelement location="${solar.jar}/jurt.jar"/>
-    <pathelement location="${solar.jar}/unoil.jar"/>
-    <pathelement location="${solar.jar}/juh.jar"/>
-    <pathelement location="${solar.jar}/java_uno.jar"/>
-    <pathelement location="${solar.jar}/ridl.jar"/>
-    <pathelement location="${env.BSH_JAR}"/>
-    <pathelement location="${solar.jar}/js.jar"/>
-    <pathelement location="${jardir}"/>
-  </path>
-
-  <path id="idesupport.class.path">
-    <pathelement path="${jardir}"/>
-  </path>
-
-  <path id="openide.class.path">
-    <pathelement path="${jardir}"/>
-    <pathelement path="${solar.jar}/openide.jar"/>
-  </path>
-
-  <path id="netbeans.editor.support.classpath">
-    <pathelement path="${jardir}"/>
-    <pathelement path="${netbeans.install.path}/modules/ext/nb-editor.jar"/>
-  </path>
-
-  <condition property="boot_refID" value="macPath" else="nonMacPath">
-    <and>
-      <os family="mac"/>
-      <os family="unix"/>
-    </and>
-  </condition>
-  <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
-  <!-- rhino.jar from OpenJDK breaks build -->
-  <path id="nonMacPath">
-    <fileset dir="${java.home}/">
-       <include name="jre/lib/*.jar"/>
-       <include name="lib/*.jar"/>
-       <exclude name="jre/lib/rhino.jar"/>
-       <exclude name="lib/rhino.jar"/>
-     </fileset>
-  </path>
-  <path id="my.bootstrap.classpath" refID="${boot_refID}"/>
-
-  <!-- ===================== Prepare Directories ========================= -->
-  <target name="prepare">
-    <mkdir dir="${jardir}"/>
-  </target>
-
-  <!-- ======================== Compile Classes ========================== -->
-  <target name="compile" depends="prepare">
-    <javac srcdir="com" destdir="${jardir}"
-         includes="**/*.java" classpathref="idlclasspath"
-         debug="${debug}" optimize="${optimize}" deprecation="off" includeantruntime="false">
-      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
-    </javac>
-    <javac srcdir="Framework/" destdir="${jardir}"
-         includes="**/*.java" classpathref="idlclasspath" debug="${debug}"
-         optimize="${optimize}" deprecation="off" includeantruntime="false">
-     <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
-    </javac>
-  </target>
-
-  <target name="idesupport.compile" depends="compile, prepare">
-    <javac srcdir="." destdir="${jardir}"
-           debug="${debug}" deprecation="on">
-      <classpath refid="idesupport.class.path"/>
-      <exclude name="${idesupport.dir}/**/.*/*"/>
-      <exclude name="${idesupport.dir}/localoffice/**/*"/>
-      <exclude name="${idesupport.dir}/LocalOffice.java"/>
-      <include name="${idesupport.dir}/*.java"/>
-      <include name="${idesupport.dir}/*/*.java"/>
-    </javac>
-  </target>
-
-  <target name="localoffice.compile" depends="prepare">
-    <javac srcdir="." destdir="${jardir}"
-           debug="${debug}" deprecation="on">
-      <classpath refid="idlclasspath"/>
-      <exclude name="${idesupport.dir}/localoffice/.*/*"/>
-      <include name="${idesupport.dir}/localoffice/*.java"/>
-    </javac>
-  </target>
-
-  <target name="netbeans.compile" depends="idesupport.compile, prepare">
-    <javac srcdir="." destdir="${jardir}"
-           debug="${debug}" deprecation="on">
-      <classpath refid="openide.class.path"/>
-      <exclude name="${netbeans.dir}/**/.*/*"/>
-      <include name="${netbeans.dir}/**/*.java"/>
-    </javac>
-  </target>
-
-  <target name="netbeans.editor.support" depends="prepare">
-    <javac srcdir="." destdir="${jardir}"
-           debug="${debug}" deprecation="on">
-      <classpath refid="netbeans.editor.support.classpath"/>
-      <include name="org/openoffice/netbeans/editor/*.java"/>
-    </javac>
-    <jar jarfile="${jardir}/nb-editorsupport.jar">
-      <fileset dir="${jardir}">
-          <include name="org/openoffice/netbeans/editor/*.class"/>
-      </fileset>
-      <fileset dir=".">
-        <include name="org/openoffice/netbeans/editor/OOo.jcs"/>
-        <include name="org/openoffice/netbeans/editor/OOo.jcb"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <!-- ===================== jar ========================= -->
-  <target name="jar" depends="compile">
-    <jar jarfile="${jardir}/ScriptProviderForJava.jar"
-         basedir="${jardir}">
-        <manifest>
-            <attribute name="Built-By" value="Sun Microsystems"/>
-            <attribute name="RegistrationClassName"
-                       value="com.sun.star.script.framework.provider.java.ScriptProviderForJava"/>
-            <attribute name="Class-Path" value="ScriptFramework.jar"/>
-            <attribute name="UNO-Type-Path" value=""/>
-        </manifest>
-        <include name="**/provider/java/*.class"/>
-    </jar>
-
-    <jar jarfile="${jardir}/ScriptProviderForBeanShell.jar"
-         basedir="${jardir}">
-        <manifest>
-            <attribute name="Built-By" value="Sun Microsystems"/>
-            <attribute name="RegistrationClassName"
-                       value="com.sun.star.script.framework.provider.beanshell.ScriptProviderForBeanShell"/>
-            <attribute name="Class-Path" value="ScriptFramework.jar bsh.jar"/>
-            <attribute name="UNO-Type-Path" value=""/>
-        </manifest>
-        <include name="**/provider/beanshell/*.class"/>
-        <fileset dir=".">
-          <include name="**/provider/beanshell/*.bsh"/>
-        </fileset>
-    </jar>
-
-    <jar jarfile="${jardir}/ScriptProviderForJavaScript.jar"
-         basedir="${jardir}">
-        <manifest>
-            <attribute name="Built-By" value="Sun Microsystems"/>
-            <attribute name="RegistrationClassName"
-                       value="com.sun.star.script.framework.provider.javascript.ScriptProviderForJavaScript"/>
-            <attribute name="Class-Path" value="ScriptFramework.jar js.jar"/>
-            <attribute name="UNO-Type-Path" value=""/>
-        </manifest>
-        <include name="**/provider/javascript/*.class"/>
-        <fileset dir=".">
-          <include name="**/provider/javascript/*.js"/>
-        </fileset>
-    </jar>
-
-    <jar jarfile="${jardir}/ScriptFramework.jar"
-         basedir="${jardir}">
-        <manifest>
-            <attribute name="Built-By" value="Sun Microsystems"/>
-            <attribute name="RegistrationClassName"
-                       value="com.sun.star.script.framework.security.SecurityDialog"/>
-            <attribute name="UNO-Type-Path" value=""/>
-        </manifest>
-        <include name="**/security/*"/>
-        <include name="**/log/*.class"/>
-        <include name="**/provider/*.class"/>
-        <include name="**/browse/*.class"/>
-        <include name="**/container/*.class"/>
-        <include name="**/io/*.class"/>
-    </jar>
-
-  </target>
-
-  <target name="idesupport.jar" depends="idesupport.compile">
-    <jar jarfile="${jardir}/idesupport.jar">
-      <fileset dir="${jardir}">
-          <include name="${idesupport.dir}/**/*.class"/>
-          <include name="CommandLineTools*"/>
-          <exclude name="${idesupport.dir}/localoffice/*.class"/>
-      </fileset>
-      <fileset dir=".">
-        <include name="${idesupport.dir}/ui/add.gif"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="localoffice.jar" depends="localoffice.compile">
-    <unjar
-      src="${solar.jar}/unoil.jar"
-      dest="${jardir}"/>
-    <jar jarfile="${jardir}/localoffice.jar">
-      <fileset dir="${jardir}">
-        <include name="${idesupport.dir}/localoffice/*.class"/>
-        <include name="drafts/com/sun/star/script/framework/storage/*.class"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="netbeans.jar" depends="netbeans.compile">
-    <jar jarfile="${jardir}/office.jar" manifest="manifest.mf">
-      <fileset dir="${jardir}">
-        <include name="${netbeans.dir}/**/*.class"/>
-        <exclude name="${netbeans.dir}/**/ParcelDescriptorChildren.class"/>
-        <exclude name="${netbeans.dir}/**/ScriptNode.class"/>
-        <include name="${idesupport.dir}/**/*.class"/>
-        <include name="CommandLineTools*"/>
-      </fileset>
-      <fileset dir=".">
-        <include name="${idesupport.dir}/ui/add.gif"/>
-        <include name="${netbeans.dir}/resources/*"/>
-        <include name="${netbeans.dir}/resources/templates/*"/>
-        <include name="${netbeans.dir}/**/Bundle*"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <!-- Uncomment this target when building within NetBeans to reinstall the
-       module.
-  <target name="netbeans.install" depends="netbeans.package">
-    <copy file="${jardir}/localoffice.jar"
-          tofile="${netbeans.home}/modules/ext/localoffice.jar"/>
-    <nbinstaller action="reinstall" module="${jardir}/office.jar"/>
-  </target>
-  -->
-
-  <!-- ====================== Clean Generated Files ===================== -->
-  <target name="clean">
-    <delete file="${jardir}/ScriptProviderForJava.jar"/>
-    <delete file="${jardir}/ScriptProviderForJavaScript.jar"/>
-    <delete file="${jardir}/ScriptProviderForBeanShell.jar"/>
-    <delete file="${jardir}/ScriptFramework.jar"/>
-    <delete file="${jardir}/office.jar"/>
-    <delete file="${jardir}/localoffice.jar"/>
-    <delete file="${jardir}/idesupport.jar"/>
-  </target>
-
-  <!-- ========================= All In One Build ======================= -->
-  <target name="all" depends="jar"/>
-</project>
diff --git a/scripting/java/makefile.mk b/scripting/java/makefile.mk
deleted file mode 100755
index 8109c9149f3b..000000000000
--- a/scripting/java/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=scripting
-TARGET=scriptruntimeforjava
-
-.INCLUDE : ant.mk
-
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)"!=""
-ALLTAR : ANTBUILD
-.ENDIF
-.ENDIF
-
-ALLTAR : \
-    $(MISC)/ScriptFramework.component \
-    $(MISC)/ScriptProviderForJava.component \
-
-$(MISC)/ScriptFramework.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_JAVA)ScriptFramework.jar' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.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
diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst
index aa1cda87fa32..2bd4c6139407 100644
--- a/scripting/prj/build.lst
+++ b/scripting/prj/build.lst
@@ -1,7 +1,2 @@
 tc	scripting	:	filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
-tc	scripting\source\pyprov				nmake	-	all	tc1_scriptingpyprov NULL
-tc	scripting\java						nmake	-	all	tc1_scriptingjava NULL
-tc	scripting\examples\java				nmake	-	all	tc1_scriptingexamplesjava tc1_scriptingjava  NULL
-tc	scripting\examples				nmake	-	all	tc1_scriptingexamples tc1_scriptingexamplesjava NULL
-tc  scripting\util\provider\javascript  nmake   -   all tc1_scriptingjsprov tc1_scriptingjava NULL
-tc  scripting\util\provider\beanshell   nmake   -   all tc1_scriptingbshprov tc1_scriptingjava NULL
+tc	scripting\prj						nmake	-	all	tc1_prj NULL
diff --git a/scripting/prj/d.lst b/scripting/prj/d.lst
index f8efa29c9d41..e69de29bb2d1 100644
--- a/scripting/prj/d.lst
+++ b/scripting/prj/d.lst
@@ -1,21 +0,0 @@
-mkdir: %_DEST%\inc\scripting
-mkdir: %_DEST%\lib\pyuno
-mkdir: %_DEST%\bin\pyuno
-
-..\%__SRC%\bin\*.dll %_DEST%\bin\*
-..\%__SRC%\bin\*.zip %COMMON_DEST%\pck\*
-..\%__SRC%\class\*.jar %_DEST%\bin\*
-..\%__SRC%\lib\*.so %_DEST%\lib\*
-..\%__SRC%\bin\*.py %_DEST%\bin\pyuno\*
-..\%__SRC%\lib\*.py %_DEST%\lib\pyuno\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-
-..\%__SRC%\bin\*.rdb %_DEST%\rdb\*
-
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
-..\%__SRC%\misc\mailmerge.component %_DEST%\xml\mailmerge.component
-..\%__SRC%\misc\ScriptFramework.component %_DEST%\xml\ScriptFramework.component
-..\%__SRC%\misc\ScriptProviderForJava.component %_DEST%\xml\ScriptProviderForJava.component
-
-# Extensions
-..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
diff --git a/scripting/source/basprov/makefile.mk b/scripting/source/basprov/makefile.mk
deleted file mode 100755
index bde15f95d5a4..000000000000
--- a/scripting/source/basprov/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scripting
-TARGET=basprov
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/basprov.obj \
-        $(SLO)$/basscript.obj \
-        $(SLO)$/baslibnode.obj \
-        $(SLO)$/basmodnode.obj \
-        $(SLO)$/basmethnode.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
-SHL1IMPLIB=	i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
-        $(SFX2LIB) \
-        $(BASICLIB) \
-        $(VCLLIB) \
-        $(SVLLIB) \
-        $(TOOLSLIB) \
-        $(UCBHELPERLIB) \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/basprov.component
-
-$(MISC)/basprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        basprov.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt basprov.component
diff --git a/scripting/source/dlgprov/makefile.mk b/scripting/source/dlgprov/makefile.mk
deleted file mode 100755
index 51f834132129..000000000000
--- a/scripting/source/dlgprov/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scripting
-TARGET=dlgprov
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/dlgprov.obj \
-        $(SLO)$/DialogModelProvider.obj \
-        $(SLO)$/dlgevtatt.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
-SHL1IMPLIB=	i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
-        $(SFX2LIB) \
-        $(VCLLIB) \
-        $(TOOLSLIB) \
-        $(XMLSCRIPTLIB) \
-        $(CPPUHELPERLIB) \
-        $(COMPHELPERLIB) \
-        $(UCBHELPERLIB) \
-        $(VBAHELPERLIB)	\
-        $(CPPULIB) \
-        $(BASICLIB) \
-        $(SALLIB)
-
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-# ------------------------------------------------------------------
-
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
- 
-
-ALLTAR : $(MISC)/dlgprov.component
-
-$(MISC)/dlgprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        dlgprov.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt dlgprov.component
diff --git a/scripting/source/protocolhandler/exports.dxp b/scripting/source/protocolhandler/exports.dxp
deleted file mode 100755
index 70033078921a..000000000000
--- a/scripting/source/protocolhandler/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/scripting/source/protocolhandler/makefile.mk b/scripting/source/protocolhandler/makefile.mk
deleted file mode 100755
index 5a2e92bbbac3..000000000000
--- a/scripting/source/protocolhandler/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=	scripting
-TARGET=		protocolhandler
-USE_DEFFILE=	TRUE
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/scripthandler.obj\
-
-SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
-        $(SFXLIB)    \
-        $(FWELIB)    \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(VCLLIB)		\
-        $(SALLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/protocolhandler.component
-
-$(MISC)/protocolhandler.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt protocolhandler.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt protocolhandler.component
diff --git a/scripting/source/provider/exports.dxp b/scripting/source/provider/exports.dxp
deleted file mode 100755
index 70033078921a..000000000000
--- a/scripting/source/provider/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/scripting/source/provider/makefile.mk b/scripting/source/provider/makefile.mk
deleted file mode 100755
index a63ae078d837..000000000000
--- a/scripting/source/provider/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=	scripting
-TARGET=		provider
-USE_DEFFILE=	TRUE
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/MasterScriptProvider.obj\
-        $(SLO)$/URIHelper.obj\
-        $(SLO)$/ActiveMSPList.obj\
-        $(SLO)$/ProviderCache.obj\
-        $(SLO)$/MasterScriptProviderFactory.obj\
-        $(SLO)$/BrowseNodeFactoryImpl.obj\
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/scripting/source/pyprov/delzip b/scripting/source/pyprov/delzip
deleted file mode 100755
index e69de29bb2d1..000000000000
--- a/scripting/source/pyprov/delzip
+++ /dev/null
diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
deleted file mode 100755
index a304d972ee52..000000000000
--- a/scripting/source/pyprov/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scripting
-TARGET=pyprov
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Targets ------------------------------------------------------
-# mailmerge is put in an extra services.rdb
-# simply do not fiddle with that. cws sb123, sb129
-ALL : ALLTAR \
-    $(DLLDEST)$/officehelper.py	\
-    $(DLLDEST)$/msgbox.py \
-    $(DLLDEST)$/mailmerge.py
-
-$(DLLDEST)$/%.py: %.py
-    cp $? $@
-
-ALLTAR : $(MISC)/mailmerge.component
-
-$(MISC)/mailmerge.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        mailmerge.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_PYTHON)mailmerge' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt mailmerge.component
-
-# scripting provider extension
-.IF "$(L10N_framework)"=="" && "$(ENABLE_SCRIPTING_PYTHON)" == "YES"
-
-EXTENSIONNAME:=ScriptProviderForPython
-EXTENSION_ZIPNAME:=script-provider-for-python
-
-COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py
-
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-.ELSE
-
-.INCLUDE : target.mk
-
-.ENDIF
diff --git a/scripting/source/runtimemgr/exports.dxp b/scripting/source/runtimemgr/exports.dxp
deleted file mode 100755
index 70033078921a..000000000000
--- a/scripting/source/runtimemgr/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/scripting/source/stringresource/makefile.mk b/scripting/source/stringresource/makefile.mk
deleted file mode 100755
index 71f8ee39e748..000000000000
--- a/scripting/source/stringresource/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scripting
-TARGET=stringresource
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/stringresource.obj \
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
-SHL1IMPLIB=	i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
-        $(TOOLSLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/stringresource.component
-
-$(MISC)/stringresource.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt stringresource.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt stringresource.component
diff --git a/scripting/source/vbaevents/makefile.mk b/scripting/source/vbaevents/makefile.mk
deleted file mode 100755
index d7bca56b9670..000000000000
--- a/scripting/source/vbaevents/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scripting
-TARGET=vbaevents
-VISIBILITY_HIDDEN=TRUE
-NO_BSYMBOLIC=	TRUE
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/service.obj \
-        $(SLO)$/eventhelper.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
-SHL1IMPLIB=     i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-                                                                              
-SHL1STDLIBS= \
-                $(CPPUHELPERLIB) \
-        $(BASICLIB) \
-        $(COMPHELPERLIB) \
-        $(SFXLIB) \
-        $(MSFILTERLIB) \
-                $(CPPULIB) \
-                $(TOOLSLIB) \
-                $(SALLIB)
-                                                                              
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-# ------------------------------------------------------------------
-
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
- 
-
-ALLTAR : $(MISC)/vbaevents.component
-
-$(MISC)/vbaevents.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        vbaevents.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt vbaevents.component
diff --git a/scripting/util/exports.dxp b/scripting/util/exports.dxp
deleted file mode 100755
index 70033078921a..000000000000
--- a/scripting/util/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/scripting/util/makefile.mk b/scripting/util/makefile.mk
deleted file mode 100755
index 04435caab11f..000000000000
--- a/scripting/util/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-PRJNAME=scripting
-TARGET=scriptframe
-USE_DEFFILE=    TRUE
-NO_BSYMBOLIC=   TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------
-LIB1TARGET=	 $(SLB)$/$(TARGET).lib
-LIB1FILES=   $(SLB)/provider.lib
-
-
-SHL1TARGET= $(TARGET)
-SHL1IMPLIB= $(TARGET)
-
-SHL1STDLIBS+=\
-    $(TOOLSLIB) \
-    $(CPPULIB) \
-    $(CPPUHELPERLIB) \
-    $(COMPHELPERLIB) \
-    $(UCBHELPERLIB) \
-    $(SALLIB)
-
-
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME	=$(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/scriptframe.component
-
-$(MISC)/scriptframe.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt scriptframe.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt scriptframe.component
diff --git a/scripting/util/provider/beanshell/delzip b/scripting/util/provider/beanshell/delzip
deleted file mode 100755
index e69de29bb2d1..000000000000
--- a/scripting/util/provider/beanshell/delzip
+++ /dev/null
diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk
deleted file mode 100755
index a7c74f51803c..000000000000
--- a/scripting/util/provider/beanshell/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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. 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
-#       Red Hat, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): David Tardon <dtardon@redhat.com>
-#
-# 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.
-
-PRJ=..$/..$/..
-
-PRJNAME=scripting
-TARGET=bshprov
-
-.INCLUDE : settings.mk
-
-.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!=""
-
-EXTENSIONNAME:=ScriptProviderForBeanShell
-EXTENSION_ZIPNAME:=script-provider-for-beanshell
-
-COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
-.IF "$(SYSTEM_BSH)" != "YES"
-EXTENSION_PACKDEPS=$(SOLARBINDIR)$/bsh.jar
-.ENDIF
-
-.IF "$(ENABLE_SCRIPTING_BEANSHELL)" != "YES"
-@all:
-    @echo "Script Provider for BeanShell build disabled."
-.ENDIF
-
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-.IF "$(SYSTEM_BSH)" != "YES"
-
-ALLTAR : $(EXTENSIONDIR)$/bsh.jar
-
-$(EXTENSIONDIR)$/bsh.jar : $(SOLARBINDIR)$/bsh.jar
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-.ENDIF
-
-.ELSE
-
-.INCLUDE : target.mk
-
-.ENDIF
diff --git a/scripting/util/provider/javascript/delzip b/scripting/util/provider/javascript/delzip
deleted file mode 100755
index e69de29bb2d1..000000000000
--- a/scripting/util/provider/javascript/delzip
+++ /dev/null