[Libreoffice] [PATCH] ant/dmake to gbuild conversions

I've attached two ant/dmake to gbuild conversions. Review would be 
appreciated.

Peter

From ac3a6978024134eee6aa013ce77f2fcc95a64a20 Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2@verizon.net>
Date: Wed, 21 Sep 2011 15:38:53 -0400
Subject: [PATCH 1/2] convert swext to gbuild and add to tail_build

---
 Module_tail_build.mk                               |    1 +
 RepositoryModule_ooo.mk                            |    1 +
 postprocess/prj/build.lst                          |    2 +-
 swext/Configuration_mediawiki.mk                   |   50 +++++
 swext/Jar_mediawiki.mk                             |   72 ++++++
 swext/Makefile                                     |   38 ++++
 swext/Module_swext.mk                              |   40 ++++
 swext/Package_mediawiki.mk                         |   40 ++++
 swext/Zip_mediawiki_develop.mk                     |   63 ++++++
 swext/Zip_wiki-publisher.mk                        |   73 +++++++
 swext/makefile.pmk                                 |   37 ----
 swext/mediawiki/Makefile                           |   50 +++++
 swext/mediawiki/build.xml                          |  227 --------------------
 swext/mediawiki/help/component.txt                 |    2 +-
 swext/mediawiki/help/makefile.mk                   |   87 --------
 swext/mediawiki/help/wiki.xhp                      |   30 ++--
 swext/mediawiki/help/wikiaccount.xhp               |    2 +-
 swext/mediawiki/help/wikiformats.xhp               |    4 +-
 swext/mediawiki/help/wikisend.xhp                  |    2 +-
 swext/mediawiki/help/wikisettings.xhp              |    6 +-
 swext/mediawiki/makefile.mk                        |   69 ------
 swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF  |    1 +
 swext/mediawiki/src/description.xml                |    4 +-
 swext/mediawiki/src/makefile.mk                    |   54 -----
 .../org/openoffice/Office/Custom/WikiExtension.xcu |    2 +-
 .../data/org/openoffice/Office/Custom/makefile.mk  |   48 ----
 .../data/org/openoffice/Office/OptionsDialog.xcu   |    2 +-
 .../data/org/openoffice/Office/makefile.mk         |   46 ----
 .../data/org/openoffice/TypeDetection/makefile.mk  |   46 ----
 .../org/openoffice/Office/Custom/makefile.mk       |   46 ----
 swext/prj/build.lst                                |    9 +-
 swext/prj/d.lst                                    |    5 -
 swext/prj/makefile.mk                              |   40 ++++
 tail_build/prj/build.lst                           |    2 +-
 34 files changed, 499 insertions(+), 702 deletions(-)
 create mode 100644 swext/Configuration_mediawiki.mk
 create mode 100644 swext/Jar_mediawiki.mk
 create mode 100644 swext/Makefile
 create mode 100644 swext/Module_swext.mk
 create mode 100644 swext/Package_mediawiki.mk
 create mode 100644 swext/Zip_mediawiki_develop.mk
 create mode 100644 swext/Zip_wiki-publisher.mk
 delete mode 100644 swext/makefile.pmk
 create mode 100644 swext/mediawiki/Makefile
 delete mode 100644 swext/mediawiki/build.xml
 delete mode 100644 swext/mediawiki/help/makefile.mk
 delete mode 100644 swext/mediawiki/makefile.mk
 create mode 100644 swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF
 delete mode 100644 swext/mediawiki/src/makefile.mk
 delete mode 100644 swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk
 delete mode 100644 swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk
 delete mode 100644 swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk
 delete mode 100644 swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk
 create mode 100644 swext/prj/makefile.mk

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index c08919b..b5685b8 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     slideshow \
     starmath \
     sw \
+    swext \
     unoxml \
     uui \
     wizards \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index e0935ea..66162d9 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     svtools \
     svx \
     sw \
+    swext \
     twain \
     toolkit \
     tools \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 30248b5..0a9b32e 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep 
CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras filter fpicker 
HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config 
remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure 
wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno 
readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder 
LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 
LIBXSLT:libxslt tail_build NULL
+po      postprocess     ::      accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep 
CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras filter fpicker 
HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config 
remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure 
wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno 
readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder 
LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 
LIBXSLT:libxslt tail_build NULL
 po     postprocess                             usr1    -       all     po_mkout NULL
 po     postprocess\checkxml            nmake   -       all     po_checkxml NULL
 po     postprocess\checkdeliver        nmake   -       all     po_checkdlv NULL
diff --git a/swext/Configuration_mediawiki.mk b/swext/Configuration_mediawiki.mk
new file mode 100644
index 0000000..9ece045
--- /dev/null
+++ b/swext/Configuration_mediawiki.mk
@@ -0,0 +1,50 @@
+#
+# 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
+#      Peter Foley <pefoley2@verizon.net>
+# 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_Configuration_Configuration,mediawiki,SRCDIR))
+
+$(eval $(call gb_Configuration_add_datas,mediawiki,swext/mediawiki/src/registry/data,\
+       org/openoffice/Office/Addons.xcu \
+       org/openoffice/Office/OptionsDialog.xcu \
+       org/openoffice/Office/ProtocolHandler.xcu \
+       org/openoffice/Office/Paths.xcu \
+       org/openoffice/Office/Custom/WikiExtension.xcu \
+       org/openoffice/TypeDetection/Filter.xcu \
+       org/openoffice/TypeDetection/Types.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,mediawiki,swext/mediawiki/src/registry/data,\
+       org/openoffice/Office/Addons.xcu \
+       org/openoffice/Office/OptionsDialog.xcu \
+       org/openoffice/Office/Custom/WikiExtension.xcu \
+))
+
+$(eval $(call gb_Configuration_add_schemas,mediawiki,swext/mediawiki/src/registry/schema,\
+       org/openoffice/Office/Custom/WikiExtension.xcs \
+))     
diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk
new file mode 100644
index 0000000..acafa86
--- /dev/null
+++ b/swext/Jar_mediawiki.mk
@@ -0,0 +1,72 @@
+#
+# 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
+#      Peter Foley <pefoley2@verizon.net>
+# 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,mediawiki,SRCDIR))
+
+$(eval $(call gb_Jar_set_packageroot,mediawiki,com))
+
+$(eval $(call 
gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\
+       commons-codec-1.3.jar \
+       commons-lang-2.3.jar \
+       commons-httpclient-3.1.jar \
+       commons-logging-1.1.1.jar \
+))
+
+$(eval $(call gb_Jar_add_jars,mediawiki,\
+       $(OUTDIR)/bin/juh.jar \
+       $(OUTDIR)/bin/jurt.jar \
+       $(OUTDIR)/bin/ridl.jar \
+       $(OUTDIR)/bin/unoil.jar \
+))
+
+ifneq ($(SYSTEM_APACHE_COMMONS),YES)
+$(eval $(call gb_Jar_add_jars,mediawiki,\
+       $(OUTDIR)/bin/commons-codec-1.3.jar \
+       $(OUTDIR)/bin/commons-lang-2.3.jar \
+       $(OUTDIR)/bin/commons-httpclient-3.1.jar \
+       $(OUTDIR)/bin/commons-logging-1.1.1.jar \
+))
+endif
+
+$(eval $(call gb_Jar_add_sourcefiles,mediawiki,\
+       swext/mediawiki/src/com/sun/star/wiki/EditPageParser \
+       swext/mediawiki/src/com/sun/star/wiki/Helper \
+       swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor \
+       swext/mediawiki/src/com/sun/star/wiki/Settings \
+       swext/mediawiki/src/com/sun/star/wiki/WikiArticle \
+       swext/mediawiki/src/com/sun/star/wiki/WikiCancelException \
+       swext/mediawiki/src/com/sun/star/wiki/WikiDialog \
+       swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl \
+       swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog \
+       swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl \
+       swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog \
+       swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory \
+))
diff --git a/swext/Makefile b/swext/Makefile
new file mode 100644
index 0000000..5bedaf0
--- /dev/null
+++ b/swext/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword 
$(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/swext/Module_swext.mk b/swext/Module_swext.mk
new file mode 100644
index 0000000..d45b7ed
--- /dev/null
+++ b/swext/Module_swext.mk
@@ -0,0 +1,40 @@
+#
+# 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
+#      Peter Foley <pefoley2@verizon.net>
+# 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_Module_Module,swext))
+
+ifeq ($(ENABLE_MEDIAWIKI),YES)
+$(eval $(call gb_Module_add_targets,swext,\
+       Jar_mediawiki \
+       Package_mediawiki \
+       Configuration_mediawiki \
+       Zip_mediawiki_develop \
+       Zip_wiki-publisher \
+))
+endif
diff --git a/swext/Package_mediawiki.mk b/swext/Package_mediawiki.mk
new file mode 100644
index 0000000..2908d12
--- /dev/null
+++ b/swext/Package_mediawiki.mk
@@ -0,0 +1,40 @@
+#
+# 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
+#      Peter Foley <pefoley2@verizon.net>
+# 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_Package_Package,mediawiki,$(WORKDIR)/CustomTarget/swext/mediawiki))
+
+$(eval $(call gb_Package_add_customtarget,mediawiki,swext/mediawiki,SRCDIR))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,swext/mediawiki,\
+       $(OUTDIR)/bin/mediawiki.jar \
+       $(OUTDIR)/bin/commons-codec-1.3.jar \
+       $(OUTDIR)/bin/commons-httpclient-3.1.jar \
+       $(OUTDIR)/bin/commons-lang-2.3.jar \
+       $(OUTDIR)/bin/commons-logging-1.1.1.jar \
+))
diff --git a/swext/Zip_mediawiki_develop.mk b/swext/Zip_mediawiki_develop.mk
new file mode 100644
index 0000000..f9901ec
--- /dev/null
+++ b/swext/Zip_mediawiki_develop.mk
@@ -0,0 +1,63 @@
+#
+# 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
+#      Peter Foley <pefoley2@verizon.net>
+# 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_Zip_Zip,mediawiki_develop,$(WORKDIR)/CustomTarget/swext/mediawiki))
+
+$(eval $(call gb_Zip_add_dependencies,mediawiki_develop,\
+       $(call gb_Package_get_target,mediawiki) \
+))
+
+$(eval $(call gb_Zip_add_files,mediawiki_develop,\
+       Addons.xcu \
+       Filter.xcu \
+       OptionsDialog.xcu \
+       Paths.xcu \
+       ProtocolHandler.xcu \
+       Types.xcu \
+       WikiExtension.xcs \
+       WikiExtension.xcu \
+       description.xml \
+       mediawiki.jar \
+       META-INF/manifest.xml \
+       WikiEditor/EditSetting.xdl \
+       WikiEditor/Settings.xdl \
+       WikiEditor/Module1.xba \
+       WikiEditor/script.xlb \
+       WikiEditor/dialog.xlb \
+       WikiEditor/SendToMediaWiki.xdl \
+       filter/odt2mediawiki.xsl \
+       help/component.txt \
+       help/en-US/com.sun.wiki-publisher/wikisend.xhp \
+       help/en-US/com.sun.wiki-publisher/wikiformats.xhp \
+       help/en-US/com.sun.wiki-publisher/wikiaccount.xhp \
+       help/en-US/com.sun.wiki-publisher/wiki.xhp \
+       help/en-US/com.sun.wiki-publisher/wikisettings.xhp \
+       license/THIRDPARTYLICENSEREADME.html \
+       templates/MediaWiki/mediawiki.ott \
+))
diff --git a/swext/Zip_wiki-publisher.mk b/swext/Zip_wiki-publisher.mk
new file mode 100644
index 0000000..30cf215
--- /dev/null
+++ b/swext/Zip_wiki-publisher.mk
@@ -0,0 +1,73 @@
+#
+# 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
+#      Peter Foley <pefoley2@verizon.net>
+# 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_Zip_Zip,wiki-publisher,$(WORKDIR)/CustomTarget/swext/mediawiki))
+
+$(eval $(call gb_Zip_set_extension,wiki-publisher,oxt))
+
+$(eval $(call gb_Zip_add_dependencies,wiki-publisher,\
+       $(call gb_Package_get_target,mediawiki) \
+))
+
+$(eval $(call gb_Package_Package,wiki-publisher,$(OUTDIR)/pck))
+
+$(eval $(call gb_Package_add_file,wiki-publisher,bin/wiki-publisher.oxt,wiki-publisher.zip))
+
+$(eval $(call gb_Zip_add_files,wiki-publisher,\
+       commons-codec-1.3.jar \
+       commons-httpclient-3.1.jar \
+       commons-lang-2.3.jar \
+       commons-logging-1.1.1.jar \
+       Addons.xcu \
+       Filter.xcu \
+       OptionsDialog.xcu \
+       Paths.xcu \
+       ProtocolHandler.xcu \
+       Types.xcu \
+       WikiExtension.xcs \
+       WikiExtension.xcu \
+       description.xml \
+       mediawiki.jar \
+       META-INF/manifest.xml \
+       WikiEditor/EditSetting.xdl \
+       WikiEditor/Settings.xdl \
+       WikiEditor/Module1.xba \
+       WikiEditor/script.xlb \
+       WikiEditor/dialog.xlb \
+       WikiEditor/SendToMediaWiki.xdl \
+       filter/odt2mediawiki.xsl \
+       help/component.txt \
+       help/en-US/com.sun.wiki-publisher/wikisend.xhp \
+       help/en-US/com.sun.wiki-publisher/wikiformats.xhp \
+       help/en-US/com.sun.wiki-publisher/wikiaccount.xhp \
+       help/en-US/com.sun.wiki-publisher/wiki.xhp \
+       help/en-US/com.sun.wiki-publisher/wikisettings.xhp \
+       license/THIRDPARTYLICENSEREADME.html \
+       templates/MediaWiki/mediawiki.ott \
+))
diff --git a/swext/makefile.pmk b/swext/makefile.pmk
deleted file mode 100644
index 8e43f2f..0000000
--- a/swext/makefile.pmk
+++ /dev/null
@@ -1,37 +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.
-#
-#*************************************************************************
-
-XSLDIR=$(SOLARXMLDIR)$/processing
-XCSROOT=$(SOLARXMLDIR)
-ABSXCSROOT=$(SOLARXMLDIR)
-DTDDIR=$(SOLARXMLDIR)
-PROCESSOUT=$(MISC)$/$(CUSTID)
-PROCESSORDIR=$(SOLARBINDIR)
-
-# no validation by inspector class
-NO_INSPECTION=TRUE
-
diff --git a/swext/mediawiki/Makefile b/swext/mediawiki/Makefile
new file mode 100644
index 0000000..ac72767
--- /dev/null
+++ b/swext/mediawiki/Makefile
@@ -0,0 +1,50 @@
+# 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
+#      Peter Foley <pefoley2@verizon.net>
+# 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.
+#
+
+SOURCE := $(SRCDIR)/swext/mediawiki
+
+all:
+       mkdir -p filter license META-INF templates/MediaWiki WikiEditor \
+       help/en-US/com.sun.wiki-publisher
+       cp $(OUTDIR)/bin/mediawiki.jar .
+       cp $(OUTDIR)/bin/commons-codec-1.3.jar .
+       cp $(OUTDIR)/bin/commons-httpclient-3.1.jar .
+       cp $(OUTDIR)/bin/commons-lang-2.3.jar .
+       cp $(OUTDIR)/bin/commons-logging-1.1.1.jar .
+       cp $(SOURCE)/src/description.xml .
+       cp $(SOURCE)/src/registry/data/org/openoffice/Office/*.xcu .
+       cp $(SOURCE)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu .
+       cp $(SOURCE)/src/registry/data/org/openoffice/TypeDetection/*.xcu .
+       cp $(SOURCE)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs .
+       cp $(SOURCE)/src/filter/odt2mediawiki.xsl filter
+       cp $(SOURCE)/help/component.txt help
+       cp $(SOURCE)/help/*.xhp help/en-US/com.sun.wiki-publisher
+       cp $(SOURCE)/src/THIRDPARTYLICENSEREADME.html license
+       cp $(SOURCE)/src/uno-extension-manifest.xml META-INF/manifest.xml
+       cp $(SOURCE)/src/filter/mediawiki.ott templates/MediaWiki
+       cp $(SOURCE)/dialogs/* WikiEditor
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
deleted file mode 100644
index b121985..0000000
--- a/swext/mediawiki/build.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-  Copyright 2000, 2010 Oracle and/or its affiliates.
-
-  OpenOffice.org - a multi-platform office productivity suite
-
-  This file is part of OpenOffice.org.
-
-  OpenOffice.org is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 3
-  only, as published by the Free Software Foundation.
-
-  OpenOffice.org is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License version 3 for more details
-  (a copy is included in the LICENSE file that accompanied this code).
-
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with OpenOffice.org.  If not, see
-  <http://www.openoffice.org/license.html>
-  for a copy of the LGPLv3 License.
-
- ************************************************************************ -->
-<project default="all">
-    <target name="init">
-        <property environment="env"/>
-        <property name="ext" value="oxt"/>
-        <property name="officeroot" value="/export/home/mav/OFFICES/OOG680/m5_netbeans_pro"/>
-        <property name="office.home" value="${officeroot}"/>
-
-        <!-- fallbacks for locations, when solenv is not used -->
-        <condition property="target" value="wikiaddon">
-            <not><isset property="target"/></not>
-        </condition>
-        <condition property="out" value="./build">
-            <not><isset property="out"/></not>
-        </condition>
-        <condition property="solar.jar" value="${officeroot}/program/classes">
-            <not><isset property="solar.jar"/></not>
-        </condition>
-
-        <!-- locations used throughout the build -->
-        <property name="name" value="wiki-publisher"/>
-        <property name="dist" value="${out}/bin"/>
-        <property name="classes" value="${out}/class"/>
-        <property name="classes.test" value="${out}/class-test"/>
-        <property name="officeclasses" value="${solar.jar}"/>
-
-        <!-- build options -->
-        <property name="sourcelevel" value="1.4"/>
-        <property name="verbose" value="false"/>
-        <property name="debug" value="${antdebug}"/>
-
-        <!-- build classpath -->
-        <path id="classpath">
-            <pathelement location="${officeclasses}/juh.jar"/>
-            <pathelement location="${officeclasses}/jurt.jar"/>
-            <pathelement location="${officeclasses}/ridl.jar"/>
-            <pathelement location="${officeclasses}/unoil.jar"/>
-            <!-- 3rd party libs -->
-            <pathelement location="${commons-codec-jar}"/>
-            <pathelement location="${commons-httpclient-jar}"/>
-            <pathelement location="${commons-lang-jar}"/>
-            <pathelement location="${commons-logging-jar}"/>
-        </path>
-
-        <!-- create output directories -->
-        <mkdir dir="${classes}"/>
-        <mkdir dir="${classes.test}"/>
-        <mkdir dir="${dist}"/>
-    </target>
-
-    <target name="compile" depends="init">
-        <javac debug="${debug}" debuglevel="lines,vars,source" destdir="${classes}" 
classpathref="classpath"
-               source="${sourcelevel}" verbose="${verbose}">
-            <src path="src"/>
-        </javac>
-    </target>
-
-    <target name="xcucheck" depends="init">
-        <condition property="no.merge.present">
-            <not>
-                <available 
file="${out}/misc/${target}/merge/org/openoffice/Office/Custom/WikiExtension.xcu" type="file"/>
-            </not>
-        </condition>
-    </target>
-
-    <target name="xcumerge" depends="xcucheck, init" if="no.merge.present">
-        <copy todir="${out}/misc/${target}/merge">
-            <fileset dir="${out}/misc/${target}/registry/data" includes="**/*.xcu" 
casesensitive="yes"/>
-        </copy>
-    </target>
-
-    <target name="jar" depends="compile, init">
-        <jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.jar">
-            <manifest>
-        <!-- FIXME: Set Class-Path correctly for the system case !-->
-                <attribute name="Class-Path" value="commons-codec-1.3.jar commons-lang-2.3.jar 
commons-httpclient-3.1.jar commons-logging-1.1.1.jar"/>
-                <attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="tmpdir" depends="xcumerge, jar, init">
-        <copy todir="${out}/misc/${target}/package_tmp" overwrite="true" encoding="UTF-8">
-            <fileset dir="${out}/misc/${target}" includes="description.xml" casesensitive="yes"/>
-            <fileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" 
includes="*.xcs" casesensitive="yes"/>
-            <fileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" 
includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes"/>
-            <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" 
includes="*.xcu" casesensitive="yes"/>
-            <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" 
casesensitive="yes"/>
-        <!-- FIXME: currently the build xcu files can not be used since the tag containing 
x-default attribute is thrown away, issue 99378
-            <fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" 
includes="*.xcu" casesensitive="yes"/>
-         -->
-            <fileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" 
casesensitive="yes"/>
-            <fileset dir="${out}/misc/${target}" includes="help/component.txt" 
casesensitive="yes"/>
-            <filterset>
-                <filter token="WIKIEXTENSIONPRODUCTNAME" value="Wiki Publisher"/>
-                <filter token="WIKIEXTENSIONID" value="com.sun.wiki-publisher"/>
-                <filter token="WIKIEXTENSIONFILENAME" value="${name}"/>
-            </filterset>
-        </copy>
-    </target>
-
-    <target name="uno-package" depends="tmpdir, xcumerge, jar, init">
-        <delete file="${dist}/${name}.${ext}"/>
-        <zip  destfile="${dist}/${name}.${ext}">
-            <fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
-            <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
-            <fileset file="${commons-codec-jar}" casesensitive="yes"/>
-            <fileset file="${commons-httpclient-jar}" casesensitive="yes"/>
-            <fileset file="${commons-lang-jar}" casesensitive="yes"/>
-            <fileset file="${commons-logging-jar}" casesensitive="yes"/>
-            <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" 
fullpath="filter/odt2mediawiki.xsl"/>
-            <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" 
fullpath="templates/MediaWiki/mediawiki.ott"/>
-            <zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" 
prefix="filter/math"/>
-            <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" 
fullpath="META-INF/manifest.xml"/>
-            <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" 
prefix="WikiEditor"/>
-            <zipfileset dir="${out}/misc/${target}/help" includes="**/*.idxl/*,**/*.*_,**/*.jar" 
casesensitive="yes" prefix="help"/>
-            <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp" casesensitive="yes" 
prefix="help"/>
-            <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" 
prefix="license"/>
-        </zip>
-    </target>
-
-    <target name="development-package" depends="jar, init">
-        <delete file="${dist}/${target}_develop.zip"/>
-        <zip  destfile="${dist}/${target}_develop.zip">
-            <zipfileset dir="${dist}" includes="${target}.jar" casesensitive="yes" filemode="664" 
dirmode="775"/>
-            <zipfileset dir="${out}/misc/${target}" includes="description.xml" casesensitive="yes" 
filemode="664" dirmode="775"/>
-            <zipfileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" 
includes="*.xcs" casesensitive="yes" filemode="664" dirmode="775"/>
-            <zipfileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" 
includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
-            <zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" 
includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
-            <zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu"  
excludes="**/ProtocolHandler.xcu,**/Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
-        <!-- FIXME: currently the build xcu files can not be used since the tag containing 
x-default attribute is thrown away, issue 99378
-            <fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" 
includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
-         -->
-            <zipfileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" 
casesensitive="yes" filemode="664" dirmode="775"/>
-            <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" 
fullpath="filter/odt2mediawiki.xsl" filemode="664" dirmode="775"/>
-            <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" 
fullpath="templates/MediaWiki/mediawiki.ott" filemode="664" dirmode="775"/>
-            <zipfileset dir="${out}/misc/${target}/help" includes="component.txt" 
casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
-            <zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" 
casesensitive="yes" prefix="help" filemode="664" dirmode="775"/>
-            <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" 
prefix="WikiEditor" filemode="664" dirmode="775"/>
-            <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" 
fullpath="META-INF/manifest.xml" filemode="664" dirmode="775"/>
-            <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" 
prefix="license" filemode="664" dirmode="775"/>
-        </zip>
-    </target>
-
-    <target depends="init, jar, uno-package, development-package" description="Build everything." 
name="all">
-        <echo message="${name} built."/>
-    </target>
-
-    <target depends="init" description="Clean all build products." name="clean">
-        <delete dir="${classes}/com/sun/star/wiki"/>
-        <delete dir="${out}/misc/${target}"/>
-        <delete dir="${dist}/${target}.jar"/>
-        <delete dir="${dist}/${name}.${ext}"/>
-        <delete dir="${dist}/${target}_develop.zip"/>
-    </target>
-
-    <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-    <target name="uno-deploy" description="Deploys UNO extension package" depends="uno-package">
-        <echo message="deploying UNO extension package ..."/>
-        <echo message="${office.unopkg} add -f ${uno.package.name}"/>
-        <exec executable="${office.unopkg}" dir="${office.program.dir}" failonerror="true">
-            <arg value="add"/>
-            <arg value="-f"/>
-            <arg file="${uno.package.name}"/>
-        </exec>
-    </target>
-
-    <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-    <target name="uno-debug" description="Debugss UNO extension package in Target Office" 
depends="uno-package">
-        <!-- security fail for executing this without netbeans -->
-        <fail unless="netbeans.home">This target can only run inside the NetBeans IDE.</fail>
-        <!-- start debugger and get connection address jpda.address -->
-        <nbjpdastart name="Debug Office" addressproperty="jpda.address" transport="dt_socket">
-            <classpath path="${build.classes.dir}"/>
-            <sourcepath path="${src.dir}"/>
-        </nbjpdastart>
-        <!-- register component in temporaary user installation -->
-        <echo message="debugging UNO extension package ..."/>
-        <echo message="wait until preparation is finished."/>
-        <echo message="  deploying UNO extension package for debugging ..."/>
-        <echo message="  ${office.unopkg} add -f ${uno.package.name}"/>
-        <exec executable="${office.unopkg}" dir="${office.program.dir}">
-            <arg value="add"/>
-            <arg value="-f"/>
-            <arg file="${uno.package.name}"/>
-            <env key="UserInstallation" value="${office.debug.user.directory}"/>
-        </exec>
-        <!-- start Office with debug Java and user installation -->
-        <echo message="  starting the Office with ..."/>
-        <echo message="  user installation: ${office.debug.user.directory}"/>
-        <echo message="  debug options:     &quot;-Xdebug&quot; 
&quot;-Xrunjdwp:transport=dt_socket,address=${jpda.address}&quot;"/>
-        <echo message="  ${office.soffice}"/>
-        <echo message="preparation finished."/>
-        <exec executable="${office.soffice}" dir="${office.program.dir}" failonerror="true">
-            <env key="UserInstallation" value="${office.debug.user.directory}"/>
-            <env key="JAVA_TOOL_OPTIONS" value="&quot;-Xdebug&quot; 
&quot;-Xrunjdwp:transport=dt_socket,address=${jpda.address}&quot;"/>
-        </exec>
-   </target>
-</project>
diff --git a/swext/mediawiki/help/component.txt b/swext/mediawiki/help/component.txt
index c5ac1de..d993ce1 100755
--- a/swext/mediawiki/help/component.txt
+++ b/swext/mediawiki/help/component.txt
@@ -1 +1 @@
-The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers without 
having to know the syntax of the MediaWiki markup language. Publish your new and existing documents 
transparently with the Writer to a wiki page.
+The Wiki Publisher enables you to create Wiki articles on MediaWiki servers without having to know 
the syntax of the MediaWiki markup language. Publish your new and existing documents transparently 
with the Writer to a wiki page.
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
deleted file mode 100644
index 1804ec2..0000000
--- a/swext/mediawiki/help/makefile.mk
+++ /dev/null
@@ -1,87 +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=swext
-TARGET=$(PRJNAME)_help
-
-.INCLUDE : settings.mk
-
-.IF "$(WITH_LANG)"!=""
-# workaround for the problem in help, the help uses en instead of en-US
-MEDIAWIKI_LANG=$(uniq en $(alllangiso))
-aux_alllangiso:=$(MEDIAWIKI_LANG)
-.ELSE          # "$(WITH_LANG)"!=""
-aux_alllangiso:=$(defaultlangiso)
-MEDIAWIKI_LANG=$(uniq en $(alllangiso))
-.ENDIF          # "$(WITH_LANG)"!=""
-
-.IF "$(ENABLE_MEDIAWIKI)" != "YES"
-all:
-    @echo Building mediawiki disabled...
-.ELSE           # "$(ENABLE_MEDIAWIKI)" != "YES"
-
-PACKAGE=com.sun.wiki-publisher
-
-OUT_MEDIAWIKI:=$(MISC)$/mediawiki
-
-LINKNAME:=help
-XHPLINKSRC:=$(OUT_MEDIAWIKI)/help
-
-XHPDEST=$(OUT_MEDIAWIKI)_merge/help
-
-XHPFILES= \
-    wiki.xhp\
-    wikiaccount.xhp\
-    wikiformats.xhp\
-    wikisend.xhp\
-    wikisettings.xhp
-
-LINKLINKFILES= \
-    $(PACKAGE)/{$(XHPFILES)}
-
-# define with own language set
-HLANGXHPFILES=$(foreach,i,$(XHPFILES) $(foreach,j,$(MEDIAWIKI_LANG) 
$(XHPDEST)$/$j$/$(PACKAGE)$/$(i:f)))
-
-.INCLUDE : target.mk
-.INCLUDE : tg_help.mk
-.INCLUDE : extension_helplink.mk
-
-ALLTAR : $(OUT_MEDIAWIKI)/help/component.txt
-
-$(OUT_MEDIAWIKI)/help/component.txt : component.txt
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(COPY) component.txt $@
-
-$(OUT_MEDIAWIKI)/help/%.xhp : $(OUT_MEDIAWIKI)_merge/help/%.xhp
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)cat $< | sed -e 's/@WIKIEXTENSIONPRODUCTNAME@/Wiki Publisher/g' | \
-        sed  's/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g' | \
-        sed 's/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@
-
-.ENDIF          # "$(ENABLE_MEDIAWIKI)" != "YES"
-
diff --git a/swext/mediawiki/help/wiki.xhp b/swext/mediawiki/help/wiki.xhp
index 22f9727..8d49b13 100644
--- a/swext/mediawiki/help/wiki.xhp
+++ b/swext/mediawiki/help/wiki.xhp
@@ -29,8 +29,8 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="comsunstarwikiMediaWikiwikixml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</title>
-<filename>/@WIKIEXTENSIONID@/wiki.xhp</filename>
+<title id="tit" xml-lang="en-US">Wiki Publisher</title>
+<filename>/com.sun.wiki-publisher/wiki.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
@@ -39,12 +39,12 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/vnd.com.sun.star.wiki:aboutbox" id="bm_id3159252" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="index" 
id="bm_id3154408"><bookmark_value>Wiki;@WIKIEXTENSIONPRODUCTNAME@</bookmark_value>
-<bookmark_value>@WIKIEXTENSIONPRODUCTNAME@</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154408"><bookmark_value>Wiki;Wiki 
Publisher</bookmark_value>
+<bookmark_value>Wiki Publisher</bookmark_value>
 <bookmark_value>extensions;MediaWiki</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id5993530" xml-lang="en-US" level="1" 
l10n="NEW">@WIKIEXTENSIONPRODUCTNAME@</paragraph>
-<paragraph role="paragraph" id="par_id9647511" xml-lang="en-US" l10n="NEW"><ahelp hid=".">By using 
the @WIKIEXTENSIONPRODUCTNAME@ you can upload your current Writer text document to a MediaWiki 
server. After uploading, all Wiki users can read your document on the Wiki.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id5993530" xml-lang="en-US" level="1" l10n="NEW">Wiki 
Publisher</paragraph>
+<paragraph role="paragraph" id="par_id9647511" xml-lang="en-US" l10n="NEW"><ahelp hid=".">By using 
the Wiki Publisher you can upload your current Writer text document to a MediaWiki server. After 
uploading, all Wiki users can read your document on the Wiki.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/vnd.com.sun.star.wiki:send" id="bm_id3159253" 
localize="false"/>
 <paragraph role="paragraph" id="par_id6468703" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose 
<item type="menuitem">File - Send - To MediaWiki</item> to upload the current Writer document to a 
MediaWiki server.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id4554582" xml-lang="en-US" level="2" l10n="NEW">System 
Requirements</paragraph>
@@ -62,9 +62,9 @@
 <paragraph role="paragraph" id="par_id7387615" xml-lang="en-US" l10n="NEW">A Wiki account on a 
supported <link href="http://www.mediawiki.org/wiki/MediaWiki";>MediaWiki</link> server</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="hd_id8047120" xml-lang="en-US" level="2" l10n="NEW">Installing 
@WIKIEXTENSIONPRODUCTNAME@</paragraph>
-<paragraph role="paragraph" id="par_id4277169" xml-lang="en-US" l10n="NEW">Before you install the 
@WIKIEXTENSIONPRODUCTNAME@, ensure that %PRODUCTNAME uses a Java Runtime Environment (JRE). To 
check the status of the JRE, choose <item type="menuitem">Tools - Options - %PRODUCTNAME - 
Java</item>. Ensure that "Use a Java runtime environment" is marked and that a Java runtime folder 
is selected in the big listbox. If no JRE was activated, then activate a JRE 1.4 or later and 
restart %PRODUCTNAME.</paragraph>
-<paragraph role="heading" id="hd_id567339" xml-lang="en-US" level="3" l10n="NEW">To Install the 
@WIKIEXTENSIONPRODUCTNAME@</paragraph>
+<paragraph role="heading" id="hd_id8047120" xml-lang="en-US" level="2" l10n="NEW">Installing Wiki 
Publisher</paragraph>
+<paragraph role="paragraph" id="par_id4277169" xml-lang="en-US" l10n="NEW">Before you install the 
Wiki Publisher, ensure that %PRODUCTNAME uses a Java Runtime Environment (JRE). To check the status 
of the JRE, choose <item type="menuitem">Tools - Options - %PRODUCTNAME - Java</item>. Ensure that 
"Use a Java runtime environment" is marked and that a Java runtime folder is selected in the big 
listbox. If no JRE was activated, then activate a JRE 1.4 or later and restart 
%PRODUCTNAME.</paragraph>
+<paragraph role="heading" id="hd_id567339" xml-lang="en-US" level="3" l10n="NEW">To Install the 
Wiki Publisher</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id1732230" xml-lang="en-US" l10n="NEW">In a Writer window, 
choose <item type="menuitem">Tools - Extension Manager</item>.</paragraph>
@@ -73,7 +73,7 @@
 <paragraph role="paragraph" id="par_id4338511" xml-lang="en-US" l10n="NEW">In the Extension 
Manager dialog, click Add.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id5882442" xml-lang="en-US" l10n="NEW">Locate the 
@WIKIEXTENSIONFILENAME@.oxt file, click Open, and then click Close. </paragraph>
+<paragraph role="paragraph" id="par_id5882442" xml-lang="en-US" l10n="NEW">Locate the 
wiki-publisher.oxt file, click Open, and then click Close. </paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id4008911" xml-lang="en-US" l10n="NEW">Close %PRODUCTNAME, and 
close also the Quickstarter if enabled.</paragraph>
@@ -82,7 +82,7 @@
 <paragraph role="paragraph" id="par_id265511" xml-lang="en-US" l10n="NEW">Restart the software, 
open a text document, then choose <item type="menuitem">Tools - Options - Internet - 
MediaWiki</item> to enter your Wiki settings. See "To Connect To a Wiki" below.</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="hd_id3569444" xml-lang="en-US" level="3" l10n="NEW">To Remove the 
@WIKIEXTENSIONPRODUCTNAME@</paragraph>
+<paragraph role="heading" id="hd_id3569444" xml-lang="en-US" level="3" l10n="NEW">To Remove the 
Wiki Publisher</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id2655110" xml-lang="en-US" l10n="NEW">In a Writer window, 
choose <item type="menuitem">Tools - Extension Manager</item>.</paragraph>
@@ -102,10 +102,10 @@
 <paragraph role="paragraph" id="par_id9533677" xml-lang="en-US" l10n="NEW">Open a Writer document, 
and choose <item type="menuitem">Tools - Options - Internet - MediaWiki</item>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id368968" xml-lang="en-US" l10n="NEW">In the <link 
href="@WIKIEXTENSIONID@/wikisettings.xhp">Options</link> dialog, click Add.</paragraph>
+<paragraph role="paragraph" id="par_id368968" xml-lang="en-US" l10n="NEW">In the <link 
href="com.sun.wiki-publisher/wikisettings.xhp">Options</link> dialog, click Add.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id6962187" xml-lang="en-US" l10n="NEW">In the <link 
href="@WIKIEXTENSIONID@/wikiaccount.xhp">MediaWiki</link> dialog, enter the account information for 
the Wiki.</paragraph>
+<paragraph role="paragraph" id="par_id6962187" xml-lang="en-US" l10n="NEW">In the <link 
href="com.sun.wiki-publisher/wikiaccount.xhp">MediaWiki</link> dialog, enter the account 
information for the Wiki.</paragraph>
 </listitem>
 </list>
 <list type="ordered">
@@ -128,13 +128,13 @@
 <paragraph role="paragraph" id="par_id3514206" xml-lang="en-US" l10n="NEW">Open a Writer 
document.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id944853" xml-lang="en-US" l10n="NEW">Write the content of the 
Wiki page. You can use formatting like text formats, headings, footnotes, and more. See the <link 
href="@WIKIEXTENSIONID@/wikiformats.xhp">list of supported formats</link>.</paragraph>
+<paragraph role="paragraph" id="par_id944853" xml-lang="en-US" l10n="NEW">Write the content of the 
Wiki page. You can use formatting like text formats, headings, footnotes, and more. See the <link 
href="com.sun.wiki-publisher/wikiformats.xhp">list of supported formats</link>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id4566484" xml-lang="en-US" l10n="NEW">Choose <item 
type="menuitem">File - Send - To MediaWiki</item>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id228278" xml-lang="en-US" l10n="NEW">In the <link 
href="@WIKIEXTENSIONID@/wikisend.xhp">Send to MediaWiki</link> dialog, specify the settings for 
your entry.</paragraph>
+<paragraph role="paragraph" id="par_id228278" xml-lang="en-US" l10n="NEW">In the <link 
href="com.sun.wiki-publisher/wikisend.xhp">Send to MediaWiki</link> dialog, specify the settings 
for your entry.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id2564165" xml-lang="en-US" l10n="NEW">
diff --git a/swext/mediawiki/help/wikiaccount.xhp b/swext/mediawiki/help/wikiaccount.xhp
index 8d1d57b..3254de7 100644
--- a/swext/mediawiki/help/wikiaccount.xhp
+++ b/swext/mediawiki/help/wikiaccount.xhp
@@ -30,7 +30,7 @@
 <meta>
 <topic id="comsunstarwikiMediaWikiwikiaccountxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">MediaWiki</title>
-<filename>/@WIKIEXTENSIONID@/wikiaccount.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikiaccount.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
diff --git a/swext/mediawiki/help/wikiformats.xhp b/swext/mediawiki/help/wikiformats.xhp
index fd9c98e..86db68d 100644
--- a/swext/mediawiki/help/wikiformats.xhp
+++ b/swext/mediawiki/help/wikiformats.xhp
@@ -30,7 +30,7 @@
 <meta>
 <topic id="comsunstarwikiMediaWikiwikiformatsxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">MediaWiki Formats</title>
-<filename>/@WIKIEXTENSIONID@/wikiformats.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikiformats.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
@@ -40,7 +40,7 @@
 <body>
 <bookmark branch="hid/vnd.com.sun.star.wiki:formats" id="bm_id7021088" localize="false"/> 
 <paragraph role="heading" id="hd_id3743095" xml-lang="en-US" level="1" l10n="NEW">MediaWiki 
Formats</paragraph>
-<paragraph role="paragraph" id="par_id8654133" xml-lang="en-US" l10n="NEW">The following list 
gives an overview of the text formats that the @WIKIEXTENSIONPRODUCTNAME@ can upload to the Wiki 
server.</paragraph>
+<paragraph role="paragraph" id="par_id8654133" xml-lang="en-US" l10n="NEW">The following list 
gives an overview of the text formats that the Wiki Publisher can upload to the Wiki 
server.</paragraph>
 <paragraph role="paragraph" id="par_id5630664" xml-lang="en-US" l10n="NEW">The OpenDocument format 
used by Writer and the WikiMedia format are quite different. Only a subset of all features can be 
transformed from one format to the other.</paragraph>
 <paragraph role="heading" id="hd_id7178868" xml-lang="en-US" level="2" 
l10n="NEW">Headings</paragraph>
 <paragraph role="paragraph" id="par_id508133" xml-lang="en-US" l10n="NEW">Apply a heading 
paragraph style to the headings in your Writer document. The Wiki will show the heading styles of 
the same outline level, formatted as defined by the Wiki engine.</paragraph>
diff --git a/swext/mediawiki/help/wikisend.xhp b/swext/mediawiki/help/wikisend.xhp
index f9a5613..f34b0e5 100644
--- a/swext/mediawiki/help/wikisend.xhp
+++ b/swext/mediawiki/help/wikisend.xhp
@@ -30,7 +30,7 @@
 <meta>
 <topic id="comsunstarwikiMediaWikiwikisendxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Send to MediaWiki</title>
-<filename>/@WIKIEXTENSIONID@/wikisend.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikisend.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
diff --git a/swext/mediawiki/help/wikisettings.xhp b/swext/mediawiki/help/wikisettings.xhp
index 22611a2..d7994e0 100644
--- a/swext/mediawiki/help/wikisettings.xhp
+++ b/swext/mediawiki/help/wikisettings.xhp
@@ -30,7 +30,7 @@
 <meta>
 <topic id="comsunstarwikiMediaWikiwikisettingsxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">MediaWiki Options</title>
-<filename>/@WIKIEXTENSIONID@/wikisettings.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikisettings.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
@@ -40,7 +40,7 @@
 <body>
 <bookmark branch="hid/vnd.com.sun.star.wiki:settings" id="bm_id7021088" localize="false"/> 
 <paragraph role="heading" id="hd_id6425672" xml-lang="en-US" level="1" l10n="NEW">MediaWiki 
Options</paragraph>
-<paragraph role="paragraph" id="par_id1188390" xml-lang="en-US" l10n="NEW">You can add, edit and 
remove MediaWiki servers. Open the dialog by <item type="menuitem">Tools - Options - Internet - 
MediaWiki</item>. Alternatively, choose <item type="menuitem">Tools - Extension Manager</item>, 
select the @WIKIEXTENSIONPRODUCTNAME@, and click the Options 
button.</paragraph><comment>Listbox</comment>
+<paragraph role="paragraph" id="par_id1188390" xml-lang="en-US" l10n="NEW">You can add, edit and 
remove MediaWiki servers. Open the dialog by <item type="menuitem">Tools - Options - Internet - 
MediaWiki</item>. Alternatively, choose <item type="menuitem">Tools - Extension Manager</item>, 
select the Wiki Publisher, and click the Options button.</paragraph><comment>Listbox</comment>
 <bookmark xml-lang="en-US" branch="hid/com.sun.star.wiki.MediaWiki.Settings.WikiList" 
id="bm_id6402783" localize="false"/>
 <paragraph role="paragraph" id="par_id300607" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click Add 
to add a new Wiki server.<br/>Select an entry and click Edit to edit the account 
settings.<br/>Select an entry and click Remove to remove the entry from the 
list.</ahelp></paragraph><comment>Add button</comment>
 <bookmark xml-lang="en-US" branch="hid/com.sun.star.wiki.MediaWiki.Settings.AddButton" 
id="bm_id6067384" localize="false"/>
@@ -49,6 +49,6 @@
 <paragraph role="paragraph" id="par_id3386333" xml-lang="en-US" l10n="NEW"><ahelp hid="." 
visibility="hidden">Opens the MediaWiki dialog to edit the selected 
entry.</ahelp></paragraph><comment>Remove button</comment>
 <bookmark xml-lang="en-US" branch="hid/com.sun.star.wiki.MediaWiki.Settings.RemoveButton" 
id="bm_id6067386" localize="false"/>
 <paragraph role="paragraph" id="par_id7285073" xml-lang="en-US" l10n="NEW"><ahelp hid="." 
visibility="hidden">Removes the selected entry from the list.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1029084" xml-lang="en-US" l10n="NEW">When you click Add or 
Edit, the <link href="@WIKIEXTENSIONID@/wikiaccount.xhp">MediaWiki</link> dialog opens.</paragraph>
+<paragraph role="paragraph" id="par_id1029084" xml-lang="en-US" l10n="NEW">When you click Add or 
Edit, the <link href="com.sun.wiki-publisher/wikiaccount.xhp">MediaWiki</link> dialog 
opens.</paragraph>
 </body>
 </helpdocument>
diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk
deleted file mode 100644
index 52d9900..0000000
--- a/swext/mediawiki/makefile.mk
+++ /dev/null
@@ -1,69 +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=swext
-TARGET=mediawiki
-.IF "$(L10N_framework)"==""
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-.INCLUDE : ant.mk
-
-.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
-COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.3.jar 
-COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.3.jar
-COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar
-COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar
-.ELSE
-COMP=fix_system_commons
-.ENDIF
-
-.IF defined(debug) || defined(DEBUG)
-ANTDEBUG=true
-.ELSE
-ANTDEBUG=off
-.ENDIF
-
-ANT_FLAGS+=-Dcommons-codec-jar=$(COMMONS_CODEC_JAR) -Dcommons-lang-jar=$(COMMONS_LANG_JAR) 
-Dcommons-httpclient-jar=$(COMMONS_HTTPCLIENT_JAR) -Dcommons-logging-jar=$(COMMONS_LOGGING_JAR) 
-Dantdebug=$(ANTDEBUG)
-
-# creates two files wiki-publisher.oxt and mediawiki_develop.zip, the second one might be used in 
further build process
-ALLTAR: $(COMP) ANTBUILD
-
-fix_system_commons:
-    @echo "Fix Java Class-Path entry for Apache Commons libraries from system."
-    @$(SED) -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR) 
file://$(COMMONS_LANG_JAR) \
-file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" -i build.xml
-    @echo "Unbundle Apache Commons libraries from Mediawiki Presentation extension."
-    @$(SED) '/file="..commons/d' -i build.xml
-
-.ELSE
-@all:
-    @echo "MediaWiki Publisher extension disabled."
-.ENDIF
-
-.ELSE
-pesudo:
-.ENDIF
diff --git a/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF 
b/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF
new file mode 100644
index 0000000..6f900e2
--- /dev/null
+++ b/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF
@@ -0,0 +1 @@
+RegistrationClassName: com.sun.star.wiki.WikiEditorImpl
diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml
index 55d6148..d8d1ad4 100644
--- a/swext/mediawiki/src/description.xml
+++ b/swext/mediawiki/src/description.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <description xmlns="http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
     <version value="1.1.1"/>
-    <identifier value="@WIKIEXTENSIONID@"/>
+    <identifier value="com.sun.wiki-publisher"/>
     <display-name>
-        <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
+        <name lang="en-US">Wiki Publisher</name>
     </display-name>
     <dependencies>
         <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0 or StarOffice 9"/>
diff --git a/swext/mediawiki/src/makefile.mk b/swext/mediawiki/src/makefile.mk
deleted file mode 100644
index 8d920ab..0000000
--- a/swext/mediawiki/src/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=swext
-TARGET=mediawiki
-GEN_HID=FALSE
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml
-
-common_build_zip=
-
-.INCLUDE : target.mk
-
-ALLTAR: $(DESCRIPTION)
-
-.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
-.IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
-PHONYDESC=.PHONY
-.ENDIF                 # "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
-$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    $(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml license/LICENSE_xxx $@
-    @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu 
b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
index 8dbde90..6888448 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
@@ -144,7 +144,7 @@
             <value xml:lang="en-US">~Save password</value>
         </prop>
         <prop oor:name="Dlg_MediaWiki_Extension_String">
-            <value xml:lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</value>
+            <value xml:lang="en-US">Wiki Publisher</value>
         </prop>
         <prop oor:name="Dlg_WikiPageExists_Label1">
             <value xml:lang="en-US">A wiki article with the title '$ARG1' already 
exists.&#13;&#13;Do you want to replace the current article with your article?&#13;&#13;</value>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk 
b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk
deleted file mode 100644
index 82f8303..0000000
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/makefile.mk
+++ /dev/null
@@ -1,48 +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=swext
-CUSTID=mediawiki
-TARGET=mediawiki_registry_data_Custom
-PACKAGE=org.openoffice.Office.Custom
-
-.INCLUDE : settings.mk
-.INCLUDE : ${PRJ}$/makefile.pmk
-
-ABSXCSROOT=$(PWD)$/$(MISC)$/$(CUSTID)
-XCSROOT=$(MISC)$/$(CUSTID)
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-LOCALIZEDFILES= WikiExtension.xcu
-
-MODULEFILES=
-
-XCUFILES = WikiExtension.xcu
-.ENDIF
-
-.INCLUDE : target.mk
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu 
b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
index f6498c5..5ae52ce 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -31,7 +31,7 @@
             <node oor:name="Leaves">
                 <node oor:name="com.sun.star.wiki.options" oor:op="fuse">
                     <prop oor:name="Id">
-                        <value>@WIKIEXTENSIONID@</value>
+                        <value>com.sun.wiki-publisher</value>
                     </prop>
                     <prop oor:name="Label">
                         <value xml:lang="en-US">MediaWiki</value>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk 
b/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk
deleted file mode 100644
index 3d14098..0000000
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,46 +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=swext
-CUSTID=mediawiki
-TARGET=mediawiki_registry_data_office
-PACKAGE=org.openoffice.Office
-
-.INCLUDE : settings.mk
-.INCLUDE : ${PRJ}$/makefile.pmk
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-LOCALIZEDFILES= Addons.xcu OptionsDialog.xcu
-
-MODULEFILES=
-
-XCUFILES = Addons.xcu OptionsDialog.xcu ProtocolHandler.xcu Paths.xcu
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk 
b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk
deleted file mode 100644
index 3224851..0000000
--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ /dev/null
@@ -1,46 +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=swext
-CUSTID=mediawiki
-TARGET=mediawiki_registry_data_typedetection
-PACKAGE=org.openoffice.TypeDetection
-
-.INCLUDE : settings.mk
-.INCLUDE : ${PRJ}$/makefile.pmk
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-LOCALIZEDFILES=
-
-MODULEFILES=
-
-XCUFILES = Filter.xcu Types.xcu
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk 
b/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk
deleted file mode 100644
index bbbb9c6..0000000
--- a/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/makefile.mk
+++ /dev/null
@@ -1,46 +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=swext
-CUSTID=mediawiki
-TARGET=mediawiki_registry_schema_custom
-PACKAGE=org.openoffice.Office.Custom
-
-.INCLUDE : settings.mk
-.INCLUDE : ${PRJ}$/makefile.pmk
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-LOCALIZEDFILES=
-
-MODULEFILES=
-
-XCSFILES = WikiExtension.xcs
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index 0bac744..314cbd8 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,10 +1,3 @@
 swext swext :   officecfg TRANSLATIONS:translations DESKTOP:l10ntools javaunohelper ridljar unoil 
jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL
-swext swext             usr1    -    all    swext_mkout NULL
-swext swext\mediawiki\help                                              nmake   -    all    
swext_mwhelp NULL
-swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom  nmake   -    all    
swext_mwschema NULL
-swext swext\mediawiki\src\registry\data\org\openoffice\Office\Custom    nmake   -    all    
swext_mwcustomdata swext_mwschema NULL
-swext swext\mediawiki\src\registry\data\org\openoffice\Office           nmake   -    all    
swext_mwofficedata NULL
-swext swext\mediawiki\src\registry\data\org\openoffice\TypeDetection    nmake   -    all    
swext_mwtypedetection NULL
-swext swext\mediawiki\src                                               nmake   -    all    
swext_mwlicense NULL
-swext swext\mediawiki                                                   nmake   -    all    
swext_mw swext_mwhelp swext_mwschema swext_mwcustomdata swext_mwofficedata swext_mwlicense 
swext_mwtypedetection NULL
+swext swext\prj    nmake   -    all    swext_prj NULL
 
diff --git a/swext/prj/d.lst b/swext/prj/d.lst
index 7f7ff29..e69de29 100644
--- a/swext/prj/d.lst
+++ b/swext/prj/d.lst
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\bin\swext
-..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin\swext\wiki-publisher.oxt
-..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin\wiki-publisher.oxt
-..\%__SRC%\bin\mediawiki_develop.zip %_DEST%\bin\swext\mediawiki_develop.zip
-
diff --git a/swext/prj/makefile.mk b/swext/prj/makefile.mk
new file mode 100644
index 0000000..85b2566
--- /dev/null
+++ b/swext/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+       cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && 
$(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index f2d4019..fe5035b 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt 
LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds 
OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx basic canvas comphelper 
connectivity cppcanvas cppu cppuhelper filter fpicker javaunohelper jurt offapi officecfg oovbaapi 
package qadevOOo DESKTOP:rdbmaker ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui 
test toolkit tools ucbhelper udkapi unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript NULL
+tb      tail_build : APACHE_COMMONS:apache-commons BERKELEYDB:berkeleydb BOOST:boost 
DESKTOP:l10ntools LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd 
LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland 
TRANSLATIONS:translations avmedia basegfx basic canvas comphelper connectivity cppcanvas cppu 
cppuhelper filter fpicker javaunohelper jurt offapi officecfg oovbaapi package qadevOOo 
readlicense_oo DESKTOP:rdbmaker ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui 
test toolkit tools ucbhelper udkapi unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript 
xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
-- 
1.7.6.1

From 3c0d04486e63aeb5902f682bdde33613ceb69b7b Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2@verizon.net>
Date: Thu, 22 Sep 2011 12:17:04 -0400
Subject: [PATCH 2/2] convert qadevOOo to gbuild

---
 RepositoryModule_ooo.mk                            |    2 +-
 qadevOOo/Jar_OOoRunner.mk                          |   77 +++++++++++++++++
 qadevOOo/Jar_OOoRunnerLight.mk                     |   67 +++++++++++++++
 qadevOOo/Module_qadevOOo.mk                        |    7 ++
 qadevOOo/build.xml                                 |   52 ------------
 qadevOOo/makefile.mk                               |   51 ------------
 qadevOOo/objdsc/Makefile                           |   32 +++++++
 qadevOOo/prj/build.lst                             |    4 +-
 qadevOOo/prj/d.lst                                 |    1 -
 qadevOOo/prj/makefile.mk                           |   40 +++++++++
 qadevOOo/runner/base/makefile.mk                   |   52 ------------
 .../runner/basicrunner/basichelper/makefile.mk     |   47 -----------
 qadevOOo/runner/basicrunner/makefile.mk            |   46 ----------
 qadevOOo/runner/complexlib/makefile.mk             |   49 -----------
 qadevOOo/runner/convwatch/makefile.mk              |   86 -------------------
 qadevOOo/runner/graphical/makefile.mk              |   76 -----------------
 qadevOOo/runner/helper/makefile.mk                 |   65 ---------------
 qadevOOo/runner/lib/makefile.mk                    |   58 -------------
 qadevOOo/runner/makefile.mk                        |   60 --------------
 qadevOOo/runner/manifest                           |    1 -
 qadevOOo/runner/org/openoffice/makefile.mk         |   46 ----------
 qadevOOo/runner/share/makefile.mk                  |   52 ------------
 qadevOOo/runner/stats/makefile.mk                  |   59 -------------
 qadevOOo/runner/util/compare/makefile.mk           |   54 ------------
 qadevOOo/runner/util/makefile.mk                   |   87 --------------------
 25 files changed, 225 insertions(+), 946 deletions(-)
 create mode 100644 qadevOOo/Jar_OOoRunner.mk
 create mode 100644 qadevOOo/Jar_OOoRunnerLight.mk
 delete mode 100755 qadevOOo/build.xml
 delete mode 100755 qadevOOo/makefile.mk
 create mode 100644 qadevOOo/objdsc/Makefile
 create mode 100644 qadevOOo/prj/makefile.mk
 delete mode 100644 qadevOOo/runner/base/makefile.mk
 delete mode 100644 qadevOOo/runner/basicrunner/basichelper/makefile.mk
 delete mode 100644 qadevOOo/runner/basicrunner/makefile.mk
 delete mode 100644 qadevOOo/runner/complexlib/makefile.mk
 delete mode 100644 qadevOOo/runner/convwatch/makefile.mk
 delete mode 100644 qadevOOo/runner/graphical/makefile.mk
 delete mode 100644 qadevOOo/runner/helper/makefile.mk
 delete mode 100644 qadevOOo/runner/lib/makefile.mk
 delete mode 100644 qadevOOo/runner/makefile.mk
 delete mode 100644 qadevOOo/runner/org/openoffice/makefile.mk
 delete mode 100644 qadevOOo/runner/share/makefile.mk
 delete mode 100644 qadevOOo/runner/stats/makefile.mk
 delete mode 100644 qadevOOo/runner/util/compare/makefile.mk
 delete mode 100644 qadevOOo/runner/util/makefile.mk

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 66162d9..fa3c7b4 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     oox \
     padmin \
     psprint_config \
+    qadevOOo \
     regexp \
     reportdesign \
     sane \
@@ -103,7 +104,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 # these have only migrated subsequentcheck for now
 $(eval $(call gb_Module_add_moduledirs,ooo,\
     configmgr \
-    qadevOOo \
     sal \
     ucb \
 ))
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
new file mode 100644
index 0000000..94fd25e
--- /dev/null
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -0,0 +1,77 @@
+#
+# 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
+#      Peter Foley <pefoley2@verizon.net>
+# 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.
+#
+
+#force debug information for OOoRunner
+gb_JavaClassSet_JAVACDEBUG:= -g
+
+$(eval $(call gb_Jar_Jar,OOoRunner,SRCDIR))
+
+$(eval $(call gb_Jar_set_jarclasspath,OOoRunner,\
+       ridl.jar \
+       unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,OOoRunner,$(SRCDIR)/qadevOOo/runner/manifest))
+
+$(eval $(call gb_Jar_add_jars,OOoRunner,\
+       $(OUTDIR)/bin/ridl.jar \
+       $(OUTDIR)/bin/unoil.jar \
+       $(OUTDIR)/bin/jurt.jar \
+       $(OUTDIR)/bin/juh.jar \
+       $(OUTDIR)/bin/java_uno.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,OOoRunner,\
+       base \
+       basicrunner \
+       complex \
+       complexlib \
+       convwatch \
+       graphical \
+       helper \
+       ifc \
+       lib \
+       mod \
+       org \
+       share \
+       stats \
+       util \
+       objdsc \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
+       qadevOOo/runner/*/* \
+       qadevOOo/runner/*/*/* \
+       qadevOOo/tests/java/*/*/* \
+       qadevOOo/tests/java/*/*/*/* \
+))
+
+$(eval $(call gb_CustomTarget_CustomTarget,qadevOOo/objdsc,SRCDIR))
+
+$(call gb_Jar_get_target,OOoRunner): $(call gb_CustomTarget_get_target,qadevOOo/objdsc)
diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk
new file mode 100644
index 0000000..687b123
--- /dev/null
+++ b/qadevOOo/Jar_OOoRunnerLight.mk
@@ -0,0 +1,67 @@
+#
+# 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
+#      Peter Foley <pefoley2@verizon.net>
+# 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.
+#
+
+#force debug information for OOoRunnerLight
+gb_JavaClassSet_JAVACDEBUG := -g
+
+$(eval $(call gb_Jar_Jar,OOoRunnerLight,SRCDIR))
+
+$(eval $(call gb_Jar_set_jarclasspath,OOoRunnerLight,\
+       ridl.jar \
+       unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_manifest,OOoRunnerLight,$(SRCDIR)/qadevOOo/runner/manifest))
+
+$(eval $(call gb_Jar_add_jars,OOoRunnerLight,\
+       $(OUTDIR)/bin/ridl.jar \
+       $(OUTDIR)/bin/unoil.jar \
+       $(OUTDIR)/bin/jurt.jar \
+       $(OUTDIR)/bin/juh.jar \
+       $(OUTDIR)/bin/java_uno.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,OOoRunnerLight,\
+       base \
+       basicrunner \
+       complexlib \
+       convwatch \
+       graphical \
+       helper \
+       lib \
+       org \
+       share \
+       stats \
+       util \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\
+       qadevOOo/runner/*/* \
+       qadevOOo/runner/*/*/* \
+))
diff --git a/qadevOOo/Module_qadevOOo.mk b/qadevOOo/Module_qadevOOo.mk
index 53612f3..f65ad29 100644
--- a/qadevOOo/Module_qadevOOo.mk
+++ b/qadevOOo/Module_qadevOOo.mk
@@ -28,6 +28,13 @@
 
 $(eval $(call gb_Module_Module,qadevOOo))
 
+ifeq ($(SOLAR_JAVA),TRUE)
+$(eval $(call gb_Module_add_targets,qadevOOo,\
+       Jar_OOoRunnerLight \
+       Jar_OOoRunner \
+))
+endif
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,qadevOOo,\
     JunitTest_qadevOOo_unoapi \
 ))
diff --git a/qadevOOo/build.xml b/qadevOOo/build.xml
deleted file mode 100755
index 027b083..0000000
--- a/qadevOOo/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<project name="qadevOOo" default="main" basedir=".">
-  <description>
-    Build file for qadevOOo project
-  </description>
-
-  <!-- set global properties for this build -->
-  <property name="qadevOOo.output" location="${out}"/>
-  <property name="qadevOOo.class"  location="${qadevOOo.output}/class"/>
-  <property name="qadevOOo.runner" location="${prj}/runner"/>
-  <property name="qadevOOo.tests" location="${prj}/tests/java"/>
-  <property name="qadevOOo.office_jars" location="${solar.jar}"/>
-
-  <!-- ================================================================================== -->
-
-  <!-- the main target -->
-  <target name="main" depends="qadevOOo_tests_build,qadevOOo_runner_build"/>
-
-  <!-- ================================================================================== -->
-
-  <!-- target for building the runner -->
-  <target name="qadevOOo_runner_build">
-    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" 
debug="${debug}" source="${build.source}" encoding="utf-8" fork="true" includeantruntime="false">
-        <classpath>
-            <pathelement location="${qadevOOo.class}"/>
-            <fileset dir="${qadevOOo.office_jars}">
-                <include name="**/ridl.jar"/>
-                <include name="**/unoil.jar"/>
-                <include name="**/jurt.jar"/>
-                <include name="**/juh.jar"/>
-                <include name="**/java_uno.jar"/>
-            </fileset>
-        </classpath>
-    </javac>
-  </target>
-
-  <!-- target for building the tests -->
-  <target name="qadevOOo_tests_build" depends="qadevOOo_runner_build">
-    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java" 
debug="${debug}" source="${build.source}" includeantruntime="false">
-        <classpath>
-            <pathelement location="${qadevOOo.class}"/>
-            <fileset dir="${qadevOOo.office_jars}">
-                <include name="**/ridl.jar"/>
-                <include name="**/unoil.jar"/>
-                <include name="**/jurt.jar"/>
-                <include name="**/juh.jar"/>
-                <include name="**/java_uno.jar"/>
-            </fileset>
-        </classpath>
-    </javac>
-  </target>
-
-</project>
diff --git a/qadevOOo/makefile.mk b/qadevOOo/makefile.mk
deleted file mode 100755
index 612b866..0000000
--- a/qadevOOo/makefile.mk
+++ /dev/null
@@ -1,51 +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.
-#
-#***************************************************************************
-
-
-PRJNAME = OOoRunner
-TARGET=qadevOOo
-PRJ=.
-
-# ------------------------------------------------
-# NEVER REMOVE THIS!
-# The OOoRunner.jar and OOoRunnerLight.jar should build with debug information all the time, also 
in the .pro builds.
-# If you have any questions about this, ask the qadevOOo Maintainer.
-debug=true
-# ------------------------------------------------
-
-.INCLUDE : ant.mk
-TST:
-    echo $(SOLAR_JAVA)
-
-.IF "$(SOLAR_JAVA)"=="TRUE"    
-.IF "$(ANT_HOME)"!="NO_ANT_HOME"
-ANT_FLAGS+=-Dbuild.source=$(JAVA_SOURCE_VER)
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
-.ENDIF
-.ENDIF 
diff --git a/qadevOOo/objdsc/Makefile b/qadevOOo/objdsc/Makefile
new file mode 100644
index 0000000..5dd0a76
--- /dev/null
+++ b/qadevOOo/objdsc/Makefile
@@ -0,0 +1,32 @@
+#
+# 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
+#      Peter Foley <pefoley2@verizon.net>
+# 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.
+#
+
+all:
+       cp -a $(SRCDIR)/qadevOOo/objdsc $(WORKDIR)/JavaClassSet/Jar/OOoRunner
+       rm $(WORKDIR)/JavaClassSet/Jar/OOoRunner/objdsc/Makefile        
diff --git a/qadevOOo/prj/build.lst b/qadevOOo/prj/build.lst
index 73092ca..19eb854 100644
--- a/qadevOOo/prj/build.lst
+++ b/qadevOOo/prj/build.lst
@@ -1,4 +1,2 @@
 qa  qadevOOo    : javaunohelper jurt ridljar unoil NULL
-qa  qadevOOo                                             usr1    -   all qa_mkout NULL
-qa  qadevOOo                                            nmake   -   all qa_runner_ant_build NULL
-qa  qadevOOo\runner                                     nmake   -   all qa_make_package 
qa_runner_ant_build NULL
+qa  qadevOOo\prj      nmake   -   all qa_prj NULL
diff --git a/qadevOOo/prj/d.lst b/qadevOOo/prj/d.lst
index 8615359..e69de29 100644
--- a/qadevOOo/prj/d.lst
+++ b/qadevOOo/prj/d.lst
@@ -1 +0,0 @@
-..\%__SRC%\class\OOoRunner*.jar %_DEST%\bin
diff --git a/qadevOOo/prj/makefile.mk b/qadevOOo/prj/makefile.mk
new file mode 100644
index 0000000..85b2566
--- /dev/null
+++ b/qadevOOo/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+       cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && 
$(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/qadevOOo/runner/base/makefile.mk b/qadevOOo/runner/base/makefile.mk
deleted file mode 100644
index 17fb497..0000000
--- a/qadevOOo/runner/base/makefile.mk
+++ /dev/null
@@ -1,52 +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 = OOoRunner
-PACKAGE = base
-TARGET = runner_base
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-JAVAFILES = TestBase.java           \
-            java_complex.java       \
-            java_fat.java           \
-            java_fat_service.java   \
-            java_cmp.java           \
-            basic_fat.java
-
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/basicrunner/basichelper/makefile.mk 
b/qadevOOo/runner/basicrunner/basichelper/makefile.mk
deleted file mode 100644
index cc45b00..0000000
--- a/qadevOOo/runner/basicrunner/basichelper/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 = OOoRunner
-PACKAGE = basicrunner$/basichelper
-TARGET = runner_basichelper
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES       = ridl.jar jurt.jar unoil.jar
-JAVAFILES      = AttributeList.java DocumentHandler.java Filter.java \
-                 Connector.java DispatchProviderInterceptor.java \
-                 ThreadRunner.java
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/basicrunner/makefile.mk b/qadevOOo/runner/basicrunner/makefile.mk
deleted file mode 100644
index 6259845..0000000
--- a/qadevOOo/runner/basicrunner/makefile.mk
+++ /dev/null
@@ -1,46 +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 = OOoRunner
-PACKAGE = basicrunner
-TARGET = runner_basicrunner
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES       = ridl.jar jurt.jar unoil.jar
-JAVAFILES      = BasicException.java BasicIfcTest.java BasicHandler.java BasicTestCase.java 
BasicHandlerProvider.java
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/complexlib/makefile.mk b/qadevOOo/runner/complexlib/makefile.mk
deleted file mode 100644
index 7af5141..0000000
--- a/qadevOOo/runner/complexlib/makefile.mk
+++ /dev/null
@@ -1,49 +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 = OOoRunner
-PACKAGE = complexlib
-TARGET = runner_complexlib
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-
-JAVAFILES = ComplexTestCase.java MethodThread.java ShowTargets.java
-
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/convwatch/makefile.mk b/qadevOOo/runner/convwatch/makefile.mk
deleted file mode 100644
index aed1532..0000000
--- a/qadevOOo/runner/convwatch/makefile.mk
+++ /dev/null
@@ -1,86 +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 = OOoRunner
-PACKAGE = convwatch
-TARGET = runner_convwatch
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
-JAVAFILES = \
- TriState.java \
- IniFile.java \
- BuildID.java \
- GfxCompare.java \
- FilenameHelper.java \
- NameHelper.java \
- HTMLOutputter.java \
- LISTOutputter.java \
- INIOutputter.java \
- PropertyName.java \
- StatusHelper.java \
- ConvWatchException.java \
- ConvWatchCancelException.java \
- OfficePrint.java \
- PRNCompare.java \
- FileHelper.java \
- OSHelper.java \
- PixelCounter.java \
- ImageHelper.java \
- BorderRemover.java \
- ConvWatch.java \
- DirectoryHelper.java \
- ConvWatchStarter.java \
- ReferenceBuilder.java \
- EnhancedComplexTestCase.java \
- MSOfficePrint.java \
- GraphicalTestArguments.java \
- GraphicalDifferenceCheck.java \
- DocumentConverter.java\
- DBHelper.java\
- DB.java\
- ValueNotFoundException.java \
- GlobalLogWriter.java \
- CrashLoopTest.java \
- ReportDesignerTest.java \
- DateHelper.java \
- TimeHelper.java
-
-
-
-
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/graphical/makefile.mk b/qadevOOo/runner/graphical/makefile.mk
deleted file mode 100644
index 4e1b0e9..0000000
--- a/qadevOOo/runner/graphical/makefile.mk
+++ /dev/null
@@ -1,76 +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 = OOoRunner
-PACKAGE = convwatch
-TARGET = runner_convwatch
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar
-JAVAFILES = \
-BuildID.java \
-DateHelper.java \
-DirectoryHelper.java \
-EnhancedComplexTestCase.java \
-FileHelper.java \
-GlobalLogWriter.java \
-HTMLResult.java \
-IDocument.java \
-IOffice.java \
-ImageHelper.java \
-IniFile.java \
-JPEGComparator.java \
-JPEGCreator.java \
-JPEGEvaluator.java \
-MSOfficePostscriptCreator.java \
-Office.java \
-OfficeException.java \
-OpenOfficeDatabaseReportExtractor.java \
-OpenOfficePostscriptCreator.java \
-ParameterHelper.java \
-PerformanceContainer.java \
-PixelCounter.java \
-PostscriptCreator.java \
-PropertyName.java \
-TimeHelper.java \
-WrongEnvironmentException.java \
-WrongSuffixException.java \
-Tolerance.java
-
-# GraphicalComparator.java
-
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/helper/makefile.mk b/qadevOOo/runner/helper/makefile.mk
deleted file mode 100644
index f5ad34c..0000000
--- a/qadevOOo/runner/helper/makefile.mk
+++ /dev/null
@@ -1,65 +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 = OOoRunner
-PACKAGE = helper
-TARGET = runner_helper
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar juh.jar unoil.jar
-
-JAVAFILES =    APIDescGetter.java      \
-            ConfigurationRead.java  \
-            StreamSimulator.java       \
-            AppProvider.java        \
-            URLHelper.java                     \
-            CfgParser.java          \
-            SimpleMailSender.java          \
-            WindowListener.java                \
-            ClParser.java           \
-            OfficeWatcher.java      \
-            OfficeProvider.java                \
-            ComplexDescGetter.java  \
-            InetTools.java          \
-            ProcessHandler.java        \
-            ContextMenuInterceptor.java        \
-            UnoProvider.java\
-            PropertyHelper.java\
-            FileTools.java
-
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/lib/makefile.mk b/qadevOOo/runner/lib/makefile.mk
deleted file mode 100644
index 4807416..0000000
--- a/qadevOOo/runner/lib/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 = OOoRunner
-PACKAGE = lib
-TARGET = runner_lib
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-
-JAVAFILES =    DynamicClassLoader.java \
-            SimpleStatus.java       \
-            TestEnvironment.java       \
-            ExceptionStatus.java    \
-            Status.java             \
-            MultiMethodTest.java    \
-            StatusException.java    \
-            TestParameters.java                \
-            TestResult.java                    \
-            MultiPropertyTest.java  \
-            TestCase.java
-
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/makefile.mk b/qadevOOo/runner/makefile.mk
deleted file mode 100644
index c18d77f..0000000
--- a/qadevOOo/runner/makefile.mk
+++ /dev/null
@@ -1,60 +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 = OOoRunner
-TARGET  = $(PRJNAME)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-SUBDIRS_TESTS = mod ifc complex
-SUBDIRS_RUNNER = util share stats lib complexlib helper basicrunner \
-            base org$/openoffice convwatch graphical
-
-JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
-JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
-
-# --- Targets ------------------------------------------------------
-.IF "$(SOLAR_JAVA)"=="TRUE" && "$(L10N_framework)"==""
-OWNJAR: ALLTAR
-
-
-.INCLUDE :  target.mk
-
-# LLA: parameter v is only verbose, need too long!
-OWNJAR: LIGHT
-    jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) 
$(JARCOMMANDS_RUNNER)
-
-# LLA: parameter v is only verbose, need too long!
-LIGHT:
-    jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
-
-.ELSE
-all:
-        @echo "no java"
-.ENDIF
diff --git a/qadevOOo/runner/manifest b/qadevOOo/runner/manifest
index 7b905b7..9bebd71 100644
--- a/qadevOOo/runner/manifest
+++ b/qadevOOo/runner/manifest
@@ -1,3 +1,2 @@
-Class-Path: ridl.jar unoil.jar
 RegistrationClassName: org.openoffice.RunnerService
 
diff --git a/qadevOOo/runner/org/openoffice/makefile.mk b/qadevOOo/runner/org/openoffice/makefile.mk
deleted file mode 100644
index e3ba3b4..0000000
--- a/qadevOOo/runner/org/openoffice/makefile.mk
+++ /dev/null
@@ -1,46 +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 = OOoRunner
-PACKAGE = org$/openoffice
-TARGET  = runner_org_openoffice
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-JAVAFILES =    Runner.java RunnerService.java
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/share/makefile.mk b/qadevOOo/runner/share/makefile.mk
deleted file mode 100644
index ff780b1..0000000
--- a/qadevOOo/runner/share/makefile.mk
+++ /dev/null
@@ -1,52 +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 = OOoRunner
-PACKAGE = share
-TARGET = runner_share
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-
-JAVAFILES =    DescEntry.java          \
-            DescGetter.java    \
-            LogWriter.java             \
-            ComplexTest.java   \
-            Watcher.java
-
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/stats/makefile.mk b/qadevOOo/runner/stats/makefile.mk
deleted file mode 100644
index af503a2..0000000
--- a/qadevOOo/runner/stats/makefile.mk
+++ /dev/null
@@ -1,59 +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 = OOoRunner
-PACKAGE = stats
-TARGET = runner_stats
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-
-JAVAFILES =    \
-            DataBaseOutProducer.java        \
-            ComplexDataBaseOutProducer.java \
-            FatDataBaseOutProducer.java     \
-            FileLogWriter.java              \
-            OutProducerFactory.java         \
-            SQLExecution.java               \
-            SimpleOutProducer.java          \
-            SimpleFileOutProducer.java      \
-            SimpleLogWriter.java            \
-            Summarizer.java                 \
-            InternalLogWriter.java
-
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/util/compare/makefile.mk b/qadevOOo/runner/util/compare/makefile.mk
deleted file mode 100644
index 2983e8aa..0000000
--- a/qadevOOo/runner/util/compare/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 = OOoRunner
-PACKAGE = util.compare
-TARGET = runner_util_compare
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
-JAVAFILES =    \
- DocComparatorFactory.java \
- DocComparator.java \
- GraphicalComparator.java \
- PDFComparator.java
-
-# doesn't implement yet.
-# PDFComparator.java \
-# XMLComparator.java
-
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/qadevOOo/runner/util/makefile.mk b/qadevOOo/runner/util/makefile.mk
deleted file mode 100644
index 7b4d723..0000000
--- a/qadevOOo/runner/util/makefile.mk
+++ /dev/null
@@ -1,87 +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 = OOoRunner
-PACKAGE = util
-TARGET = runner_util
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = ridl.jar jurt.jar unoil.jar
-
-JAVAFILES =    AccessibilityTools.java \
-            BasicMacroTools.java    \
-            BookmarkDsc.java           \
-            ControlDsc.java                    \
-            dbg.java                           \
-            DBTools.java                       \
-            DefaultDsc.java                    \
-            DesktopTools.java          \
-            DrawTools.java          \
-            DynamicClassLoader.java \
-            FootnoteDsc.java           \
-            FormTools.java                     \
-            FrameDsc.java                      \
-            InstCreator.java           \
-            InstDescr.java                     \
-            ParagraphDsc.java       \
-            ReferenceMarkDsc.java      \
-            RegistryTools.java         \
-            ShapeDsc.java                      \
-            SOfficeFactory.java                \
-            StyleFamilyDsc.java                \
-            PropertyName.java          \
-            SysUtils.java           \
-            TableDsc.java                      \
-            TextSectionDsc.java                \
-            XLayerImpl.java            \
-            XLayerHandlerImpl.java     \
-            XSchemaHandlerImpl.java \
-            UITools.java            \
-            utils.java              \
-            ValueChanger.java          \
-            ValueComparer.java         \
-            WaitUnreachable.java    \
-            WriterTools.java           \
-            XInstCreator.java       \
-            XMLTools.java
-
-JAVACLASSFILES=        $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
-TST:
-        @echo $(JAVACLASSFILES)
-- 
1.7.6.1