convert swext to gbuild and add to tail_build

author: Peter Foley <pefoley2@verizon.net> 2011-09-21 15:38:53 -0400
committer: Peter Foley <pefoley2@verizon.net> 2011-10-07 23:03:34 +0000
commit: e7a1e17c4fdea4103e7f921e8cd9c315c1dbe612 (patch)
tree: 12450a7f23781407ba0f08203bc8b106e1649bbb /swext
parent: fed75d001e6a48a84bc46606848af3ba0219df29 (diff)
27 files changed, 310 insertions, 657 deletions
diff --git a/swext/Configuration_mediawiki.mk b/swext/Configuration_mediawiki.mk
new file mode 100644
index 000000000000..9ece045fdddc
--- /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/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
new file mode 100644
index 000000000000..278b467d5a35
--- /dev/null
+++ b/swext/Extension_wiki-publisher.mk
@@ -0,0 +1,62 @@
+#
+# 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.
+#
+
+WIKISRC := $(SRCDIR)/swext/mediawiki
+
+$(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src))
+
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.3.jar,$(OUTDIR)/bin/commons-codec-1.3.jar)) 
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar)) 
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar)) 
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar)) 
+$(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Addons.xcu)) 
+$(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,Paths.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Paths.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,ProtocolHandler.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,Types.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Settings.xdl,$(WIKISRC)/dialogs/Settings.xdl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(WIKISRC)/dialogs/Module1.xba))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(WIKISRC)/dialogs/script.xlb))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,component.txt,$(WIKISRC)/src/component.txt))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wiki.xhp,$(WIKISRC)/help/wiki.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(WIKISRC)/src/THIRDPARTYLICENSEREADME.html))
+$(eval $(call gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(WIKISRC)/src/filter/mediawiki.ott))
+
diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk
new file mode 100644
index 000000000000..acafa8636587
--- /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.pmk b/swext/Makefile
index 8e43f2f723f0..5bedaf0b9dcf 100644
--- a/swext/makefile.pmk
+++ b/swext/Makefile
@@ -1,8 +1,8 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,13 +25,14 @@
 #
 #*************************************************************************
 
-XSLDIR=$(SOLARXMLDIR)$/processing
-XCSROOT=$(SOLARXMLDIR)
-ABSXCSROOT=$(SOLARXMLDIR)
-DTDDIR=$(SOLARXMLDIR)
-PROCESSOUT=$(MISC)$/$(CUSTID)
-PROCESSORDIR=$(SOLARBINDIR)
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-# no validation by inspector class
-NO_INSPECTION=TRUE
+$(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 000000000000..00229f886585
--- /dev/null
+++ b/swext/Module_swext.mk
@@ -0,0 +1,39 @@
+#
+# 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 \
+	Configuration_mediawiki \
+	Zip_mediawiki_develop \
+	Extension_wiki-publisher \
+))
+endif
diff --git a/swext/Zip_mediawiki_develop.mk b/swext/Zip_mediawiki_develop.mk
new file mode 100644
index 000000000000..cb99ce894cd1
--- /dev/null
+++ b/swext/Zip_mediawiki_develop.mk
@@ -0,0 +1,60 @@
+#
+# 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.
+#
+
+WIKISRC := $(SRCDIR)/swext/mediawiki
+
+$(eval $(call gb_Zip_Zip,mediawiki_develop,$(WORKDIR)/Zip/mediawiki_develop))
+
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Addons.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Addons.xcu)) 
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,OptionsDialog.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Paths.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Paths.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,ProtocolHandler.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Types.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,description.xml,$(WIKISRC)/src/description.xml))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,META-INF/manifest.xml,$(WIKISRC)/src/manifest.xml))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Settings.xdl,$(WIKISRC)/dialogs/Settings.xdl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Module1.xba,$(WIKISRC)/dialogs/Module1.xba))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/script.xlb,$(WIKISRC)/dialogs/script.xlb))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,component.txt,$(WIKISRC)/src/component.txt))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wiki.xhp,$(WIKISRC)/help/wiki.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,license/THIRDPARTYLICENSEREADME.html,$(WIKISRC)/src/THIRDPARTYLICENSEREADME.html))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,templates/MediaWiki/mediawiki.ott,$(WIKISRC)/src/filter/mediawiki.ott))
+
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
deleted file mode 100644
index f941e39529d3..000000000000
--- a/swext/mediawiki/build.xml
+++ /dev/null
@@ -1,226 +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="component.txt" casesensitive="yes"/>
-            <filterset>
-                <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}" 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 temporary 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/makefile.mk b/swext/mediawiki/help/makefile.mk
deleted file mode 100644
index 70ed4cd1eb1d..000000000000
--- a/swext/mediawiki/help/makefile.mk
+++ /dev/null
@@ -1,81 +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
-
-$(OUT_MEDIAWIKI)/help/%.xhp : $(OUT_MEDIAWIKI)_merge/help/%.xhp
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)cat $< | \
-        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 20a57b58cb22..8d49b1385715 100644
--- a/swext/mediawiki/help/wiki.xhp
+++ b/swext/mediawiki/help/wiki.xhp
@@ -30,7 +30,7 @@
 <meta>
 <topic id="comsunstarwikiMediaWikiwikixml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Wiki Publisher</title>
-<filename>/@WIKIEXTENSIONID@/wiki.xhp</filename>
+<filename>/com.sun.wiki-publisher/wiki.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
@@ -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>
@@ -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 8d1d57ba1d25..3254de7e8128 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 eb02a5f4ad96..86db68dd8205 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"/>
diff --git a/swext/mediawiki/help/wikisend.xhp b/swext/mediawiki/help/wikisend.xhp
index f9a5613b5184..f34b0e5e4377 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 ce15f11c187c..d7994e00c931 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"/>
@@ -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 52d9900ab1e6..000000000000
--- 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 000000000000..6f900e21f56b
--- /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/component.txt b/swext/mediawiki/src/component.txt
index d993ce105691..d993ce105691 100644..100755
--- a/swext/mediawiki/src/component.txt
+++ b/swext/mediawiki/src/component.txt
diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml
index 11c790e5000d..31dcfe3d9840 100644
--- a/swext/mediawiki/src/description.xml
+++ b/swext/mediawiki/src/description.xml
@@ -1,7 +1,7 @@
 <?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">Wiki Publisher</name>
     </display-name>
diff --git a/swext/mediawiki/src/makefile.mk b/swext/mediawiki/src/makefile.mk
deleted file mode 100644
index bd1f1bbf75b7..000000000000
--- a/swext/mediawiki/src/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=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) $(MISC)/$(TARGET)/component.txt
-
-.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
-
-$(MISC)/$(TARGET)/component.txt : component.txt
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
diff --git a/swext/mediawiki/src/uno-extension-manifest.xml b/swext/mediawiki/src/manifest.xml
index 1f9b839e86c5..1f9b839e86c5 100644
--- a/swext/mediawiki/src/uno-extension-manifest.xml
+++ b/swext/mediawiki/src/manifest.xml
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 82f8303054ab..000000000000
--- 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 f6498c5faef3..5ae52ce668f6 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 3d1409827390..000000000000
--- 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 3224851026c0..000000000000
--- 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 bbbb9c664cbb..000000000000
--- 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 0bac744df814..314cbd8f9248 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 7f7ff29dc0ee..e69de29bb2d1 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 000000000000..0997622e00f6
--- /dev/null
+++ b/swext/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
author	Peter Foley <pefoley2@verizon.net>	2011-09-21 15:38:53 -0400
committer	Peter Foley <pefoley2@verizon.net>	2011-10-07 23:03:34 +0000
commit	e7a1e17c4fdea4103e7f921e8cd9c315c1dbe612 (patch)
tree	12450a7f23781407ba0f08203bc8b106e1649bbb /swext
parent	fed75d001e6a48a84bc46606848af3ba0219df29 (diff)