convert xmerge to gbuild and add to tail_build

34 files changed, 358 insertions, 1193 deletions

diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
new file mode 100644
index 000000000000..858b0e47da28
--- /dev/null
+++ b/xmerge/Jar_XMergeBridge.mk
@@ -0,0 +1,52 @@
+#
+# 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,XMergeBridge,SRCDIR))
+
+$(eval $(call gb_Jar_set_componentfile,XMergeBridge,xmerge/source/bridge/XMergeBridge,OOO))
+
+$(eval $(call gb_Jar_set_manifest,XMergeBridge,$(SRCDIR)/xmerge/source/bridge/manifest.mf))
+
+$(eval $(call gb_Jar_set_packageroot,XMergeBridge,*.class))
+
+$(eval $(call gb_Jar_set_jarclasspath,XMergeBridge,\
+	xmerge.jar \
+))
+
+$(eval $(call gb_Jar_add_jars,XMergeBridge,\
+	$(OUTDIR)/bin/xmerge.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,XMergeBridge,\
+	xmerge/source/bridge/java/XMergeBridge \
+))
diff --git a/xmerge/Jar_aportisdoc.mk b/xmerge/Jar_aportisdoc.mk
new file mode 100644
index 000000000000..f9a13e8b4dd7
--- /dev/null
+++ b/xmerge/Jar_aportisdoc.mk
@@ -0,0 +1,42 @@
+#
+# 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,aportisdoc,SRCDIR))
+
+$(eval $(call gb_Jar_add_packagefile,aportisdoc,META-INF/converter.xml,$(SRCDIR)/xmerge/source/aportisdoc/converter.xml))
+
+$(eval $(call gb_Jar_set_packageroot,aportisdoc,org))
+
+$(eval $(call gb_Jar_add_jars,aportisdoc,\
+	$(OUTDIR)/bin/xmerge.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,aportisdoc,\
+	xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/* \
+))
diff --git a/xmerge/Jar_htmlsoff.mk b/xmerge/Jar_htmlsoff.mk
new file mode 100644
index 000000000000..501e77415b97
--- /dev/null
+++ b/xmerge/Jar_htmlsoff.mk
@@ -0,0 +1,37 @@
+#
+# 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,htmlsoff,SRCDIR))
+
+$(eval $(call gb_Jar_add_packagefile,htmlsoff,META-INF/converter.xml,$(SRCDIR)/xmerge/source/htmlsoff/converter.xml))
+$(eval $(call gb_Jar_add_packagefile,htmlsoff,htmltosoff.xsl,$(SRCDIR)/xmerge/source/htmlsoff/htmltosoff.xsl))
+$(eval $(call gb_Jar_add_packagefile,htmlsoff,sofftohtml.xsl,$(SRCDIR)/xmerge/source/htmlsoff/sofftohtml.xsl))
+
+$(eval $(call gb_Jar_set_packageroot,htmlsoff,*.xsl))
+
diff --git a/xmerge/Jar_pexcel.mk b/xmerge/Jar_pexcel.mk
new file mode 100644
index 000000000000..8f18b3363ea5
--- /dev/null
+++ b/xmerge/Jar_pexcel.mk
@@ -0,0 +1,44 @@
+#
+# 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,pexcel,SRCDIR))
+
+$(eval $(call gb_Jar_add_packagefile,pexcel,META-INF/converter.xml,$(SRCDIR)/xmerge/source/pexcel/converter.xml))
+
+$(eval $(call gb_Jar_set_packageroot,pexcel,org))
+
+$(eval $(call gb_Jar_add_jars,pexcel,\
+	$(OUTDIR)/bin/xmerge.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,pexcel,\
+	xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/* \
+	xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/* \
+	xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/* \
+))
diff --git a/xmerge/Jar_pocketword.mk b/xmerge/Jar_pocketword.mk
new file mode 100644
index 000000000000..ecbfe8efaaf0
--- /dev/null
+++ b/xmerge/Jar_pocketword.mk
@@ -0,0 +1,42 @@
+#
+# 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,pocketword,SRCDIR))
+
+$(eval $(call gb_Jar_add_packagefile,pocketword,META-INF/converter.xml,$(SRCDIR)/xmerge/source/pocketword/converter.xml))
+
+$(eval $(call gb_Jar_set_packageroot,pocketword,org))
+
+$(eval $(call gb_Jar_add_jars,pocketword,\
+	$(OUTDIR)/bin/xmerge.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,pocketword,\
+	xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/* \
+))
diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk
new file mode 100644
index 000000000000..943f8b5045b4
--- /dev/null
+++ b/xmerge/Jar_xmerge.mk
@@ -0,0 +1,54 @@
+#
+# 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,xmerge,SRCDIR))
+
+$(eval $(call gb_Jar_set_manifest,xmerge,$(SRCDIR)/xmerge/source/xmerge/xmerge.mf))
+
+$(eval $(call gb_Jar_add_jars,xmerge,\
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/juh.jar \
+))
+
+$(eval $(call gb_Jar_set_jarclasspath,xmerge,\
+	xml-apis.jar \
+	xercesImpl.jar \
+	serializer.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,xmerge,org))
+
+$(eval $(call gb_Jar_add_sourcefiles,xmerge,\
+	xmerge/source/xmerge/java/org/openoffice/xmerge/* \
+	xmerge/source/xmerge/java/org/openoffice/xmerge/*/* \
+	xmerge/source/xmerge/java/org/openoffice/xmerge/*/*/* \
+	xmerge/source/xmerge/java/org/openoffice/xmerge/*/*/*/* \
+))
diff --git a/xmerge/source/pexcel/makefile.mk b/xmerge/Makefile
index 7f51a43e7530..5bedaf0b9dcf 100644
--- a/xmerge/source/pexcel/makefile.mk
+++ b/xmerge/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,11 +25,14 @@
 #
 #*************************************************************************
 
-TARGET=pexcel
-PRJ=../..
-PRJNAME=xmerge
+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)))
 
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
+# vim: set noet sw=4 ts=4:
diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk
new file mode 100644
index 000000000000..b5ef2789da5e
--- /dev/null
+++ b/xmerge/Module_xmerge.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,xmerge))
+
+$(eval $(call gb_Module_add_targets,xmerge,\
+	Jar_aportisdoc \
+	Jar_htmlsoff \
+	Jar_pexcel \
+	Jar_pocketword \
+	Jar_xmerge \
+	Jar_XMergeBridge \
+	Package_xmergesync \
+))
diff --git a/xmerge/Package_xmergesync.mk b/xmerge/Package_xmergesync.mk
new file mode 100644
index 000000000000..fbeead52090b
--- /dev/null
+++ b/xmerge/Package_xmergesync.mk
@@ -0,0 +1,34 @@
+#
+# 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,xmergesync,$(SRCDIR)/xmerge/source/activesync/BIN))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Package_add_file,xmergesync,bin/xmergesync.dll,xmergesync.dll))
+endif
diff --git a/xmerge/build.xml b/xmerge/build.xml
deleted file mode 100644
index 5878c1acf0b9..000000000000
--- a/xmerge/build.xml
+++ /dev/null
@@ -1,88 +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 name="xmerge" default="main" basedir=".">
-
-    <property environment="env"/>
-    <property name="solar.platform" value="${env.COMP_ENV}${env.PROEXT}"/>
-    <property name="out" location="${basedir}/${solar.platform}"/>
-    <property name="solar.jar" location="${env.SOLARVER}/${solar.platform}/bin${env.UPDMINOREXT}"/>
-    <property name="debug" value="yes"/>
-    <property name="optimize" value="no"/>
-
-    <target name="init">
-        <echoproperties prefix="solar"/>
-        <mkdir dir="${out}"/>
-        <mkdir dir="${out}/class"/>
-    </target>
-
-    <target name="xmerge" depends="init">
-        <ant dir="source/xmerge" target="all"/>
-    </target>
-
-    <target name="bridge" depends="xmerge, init">
-        <ant dir="source/bridge" target="all"/>
-    </target>
-
-    <target name="aportisdoc" depends="xmerge, init">
-        <ant dir="source/aportisdoc" target="all"/>
-    </target>
-
-    <target name="pexcel" depends="xmerge, init">
-        <ant dir="source/pexcel" target="all"/>
-    </target>
-
-    <target name="pocketword" depends="xmerge, init">
-        <ant dir="source/pocketword" target="all"/>
-    </target>
-
-    <target name="htmlsoff" depends="init">
-        <ant dir="source/htmlsoff" target="all"/>
-    </target>
-
-    <target name="wordsmith" depends="xmerge">
-        <echo>wordsmith filter is not supported</echo>
-        <ant dir="source/wordsmith" target="all"/>
-    </target>
-
-    <target name="minicalc" depends="xmerge">
-        <echo>minicalc filter is not supported</echo>
-        <ant dir="source/minicalc" target="all"/>
-    </target>
-
-    <target name="util" depends="xmerge, bridge, aportisdoc, pexcel, pocketword, htmlsoff">
-        <ant dir="util" target="all"/>
-    </target>
-
-    <target name="all" depends="xmerge, bridge, aportisdoc, pexcel, pocketword, htmlsoff, util">
-    </target>
-
-    <target name="clean">
-        <delete dir="${out}" />
-    </target>
-
-</project>
-
diff --git a/xmerge/prj/build.lst b/xmerge/prj/build.lst
index 39cde4210a1b..35bf4db7187e 100644
--- a/xmerge/prj/build.lst
+++ b/xmerge/prj/build.lst
@@ -1,11 +1,2 @@
 xmrg xmerge : solenv unoil javaunohelper LIBXSLT:libxslt NULL
-xmrg xmerge                        usr1  - all xmrg_mkout NULL
-xmrg xmerge\inc                    nmake - all xmrg_inc NULL
-xmrg xmerge\source\xmerge          nmake - all xmrg_xmerge xmrg_inc NULL
-xmrg xmerge\source\bridge          nmake - all xmrg_bridge xmrg_xmerge xmrg_inc NULL
-xmrg xmerge\source\aportisdoc      nmake - all xmrg_aportis xmrg_xmerge xmrg_inc NULL
-xmrg xmerge\source\pexcel          nmake - all xmrg_pexcel xmrg_xmerge xmrg_inc NULL
-xmrg xmerge\source\pocketword      nmake - all xmrg_pword xmrg_xmerge xmrg_inc NULL
-xmrg xmerge\source\htmlsoff        nmake - all xmrg_htmlsoff xmrg_inc NULL
-xmrg xmerge\source\activesync      nmake - all xmrg_activesync xmrg_inc NULL
-xmrg xmerge\util                   nmake - all xmrg_util xmrg_xmerge xmrg_bridge xmrg_aportis xmrg_pexcel xmrg_pword NULL
+xmrg xmerge\prj                   nmake - all xmrg_prj NULL
diff --git a/xmerge/prj/d.lst b/xmerge/prj/d.lst
index c0f2df93b209..e69de29bb2d1 100644
--- a/xmerge/prj/d.lst
+++ b/xmerge/prj/d.lst
@@ -1,12 +0,0 @@
-..\%__SRC%\class\xmerge.jar %_DEST%\bin\xmerge.jar
-..\%__SRC%\class\pexcel.jar %_DEST%\bin\pexcel.jar
-..\%__SRC%\class\htmlsoff.jar %_DEST%\bin\htmlsoff.jar
-..\%__SRC%\class\aportisdoc.jar  %_DEST%\bin\aportisdoc.jar
-..\%__SRC%\class\XMergeBridge.jar %_DEST%\bin\XMergeBridge.jar
-..\%__SRC%\class\pocketword.jar  %_DEST%\bin\pocketword.jar
-..\%__SRC%\bin\xmergesync.dll  %_DEST%\bin\xmergesync.dll
-mkdir: %_DEST%\doc\xmerge
-..\%__SRC%\doc\javadoc\package-list %_DEST%\doc\xmerge\package-list
-..\%__SRC%\doc\xmerge_javadoc.zip %_DEST%\doc\xmerge_javadoc.zip
-..\%__SRC%\doc\writer2latex_javadoc.zip %_DEST%\doc\writer2latex_javadoc.zip
-..\%__SRC%\misc\XMergeBridge.component %_DEST%\xml\XMergeBridge.component
diff --git a/xmerge/prj/makefile.mk b/xmerge/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/xmerge/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/xmerge/source/aportisdoc/build.xml b/xmerge/source/aportisdoc/build.xml
deleted file mode 100644
index 6e9d22b84b9a..000000000000
--- a/xmerge/source/aportisdoc/build.xml
+++ /dev/null
@@ -1,76 +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 name="aportisdoc" default="all" basedir=".">
-
-    <property file="../inc/antbuild.properties"/>
-
-    <path id="classpath">
-        <pathelement location="${build.dir}/xmerge.jar"/>
-    </path>
-
-
-    <target name="init" >
-        <mkdir dir="${target.dir}"/>
-    </target>
-
-    <!-- compile java sources in ${package} -->
-    <target name="compile" depends="init">
-        <javac srcdir="${src.dir}"
-               destdir="${target.dir}"
-               debug="${debug}"
-               deprecation="${deprecation}"
-               optimize="${optimize}">
-            <classpath refid="classpath"/>
-        </javac>
-    </target>
-
-    <!-- package to jar -->
-    <target name="jar" depends="compile">
-        <jar destfile="${target.jar}">
-            <fileset dir="${target.dir}"
-                     includes="**/*.class" />
-            <metainf dir="${basedir}">
-                <filename name="converter.xml"/>
-            </metainf>
-         </jar>
-    </target>
-
-    <!-- clean up -->
-    <target name="clean">
-        <delete dir="${class.dir}"/>
-        <delete file="${target.jar}"/>
-    </target>
-
-    <target name="all" depends="jar">
-    </target>
-
-</project>
-
diff --git a/xmerge/source/aportisdoc/makefile.mk b/xmerge/source/aportisdoc/makefile.mk
deleted file mode 100644
index dad48f952b51..000000000000
--- a/xmerge/source/aportisdoc/makefile.mk
+++ /dev/null
@@ -1,35 +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.
-#
-#*************************************************************************
-
-TARGET=aportisdoc
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/source/bridge/antcall.txt b/xmerge/source/bridge/antcall.txt
deleted file mode 100644
index 96abc7b24821..000000000000
--- a/xmerge/source/bridge/antcall.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-r:\btools\apache-ant-1.6.1\bin\ant 
--Dprj=../.. 
--Dprjname= 
--Ddebug=off 
--Doptimize=on  
--Dtarget=xmrg_bridge 
--Dsolar.update=on 
--Dout=../..\wntmsci10.pro 
--Dinpath=wntmsci10.pro 
--Dproext=".pro"  
--Dsolar.bin=Y:\so-cwsserv03\lo8\SRC680\wntmsci10.pro\bin.m105 
--Dsolar.jar=Y:\so-cwsserv03\lo8\SRC680\wntmsci10.pro\bin.m105 
--Dsolar.doc=Y:\so-cwsserv03\lo8\SRC680\wntmsci10.pro\doc.m105  
--Dcommon.jar=Y:\so-cwsserv03\lo8\SRC680\common.pro\bin.m105 
--Dcommon.doc=Y:\so-cwsserv03\lo8\SRC680\common.pro\doc.m105  
--f build.xml  
--emacs
-
-Buildfile: build.xml
diff --git a/xmerge/source/bridge/build.xml b/xmerge/source/bridge/build.xml
deleted file mode 100644
index 5a2a2255cd52..000000000000
--- a/xmerge/source/bridge/build.xml
+++ /dev/null
@@ -1,78 +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 name="XMergeBridge" default="all" basedir=".">
-
-    <property file="../inc/antbuild.properties"/>
-
-    <path id="classpath">
-        <pathelement location="${build.dir}/xmerge.jar"/>
-        <pathelement location="${solar.jar}/unoil.jar"/>
-        <pathelement location="${solar.jar}/ridl.jar"/>
-        <pathelement location="${solar.jar}/jurt.jar"/>
-        <pathelement location="${solar.jar}/juh.jar"/>
-    </path>
-
-
-    <target name="init" >
-        <mkdir dir="${target.dir}"/>
-    </target>
-
-    <!-- compile java sources in ${package} -->
-    <target name="compile" depends="init">
-        <javac srcdir="${src.dir}"
-               destdir="${target.dir}"
-               debug="${debug}"
-               deprecation="${deprecation}"
-               optimize="${optimize}">
-            <classpath refid="classpath"/>
-        </javac>
-    </target>
-
-    <!-- package to jar -->
-    <target name="jar" depends="compile">
-        <jar destfile="${target.jar}"
-             manifest="manifest.mf">
-            <fileset dir="${target.dir}"
-                     includes="**/*.class" />
-         </jar>
-    </target>
-
-    <!-- clean up -->
-    <target name="clean">
-        <delete dir="${class.dir}"/>
-        <delete file="${target.jar}"/>
-    </target>
-
-    <target name="all" depends="jar">
-    </target>
-
-</project>
-
diff --git a/xmerge/source/bridge/makefile.mk b/xmerge/source/bridge/makefile.mk
deleted file mode 100644
index 05fa5a738d84..000000000000
--- a/xmerge/source/bridge/makefile.mk
+++ /dev/null
@@ -1,43 +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.
-#
-#*************************************************************************
-
-TARGET=XMergeBridge
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
-
-ALLTAR : $(MISC)/XMergeBridge.component
-
-$(MISC)/XMergeBridge.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt XMergeBridge.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_JAVA)XMergeBridge.jar' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt XMergeBridge.component
diff --git a/xmerge/source/bridge/manifest.mf b/xmerge/source/bridge/manifest.mf
index 167082c1e7dc..1c63d9e6d76f 100644
--- a/xmerge/source/bridge/manifest.mf
+++ b/xmerge/source/bridge/manifest.mf
@@ -1,3 +1,2 @@
-Class-Path: xmerge.jar
 RegistrationClassName: XMergeBridge
 UNO-Type-Path: 
diff --git a/xmerge/source/htmlsoff/build.xml b/xmerge/source/htmlsoff/build.xml
deleted file mode 100644
index 90cbcbb4beae..000000000000
--- a/xmerge/source/htmlsoff/build.xml
+++ /dev/null
@@ -1,67 +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 name="htmlsoff" default="all" basedir=".">
-
-    <property file="../inc/antbuild.properties"/>
-
-    <path id="classpath">
-        <pathelement location="${build.dir}/xmerge.jar"/>
-    </path>
-
-
-    <target name="init" >
-    </target>
-
-    <!-- compile java sources in ${package} -->
-    <target name="compile" depends="init">
-    </target>
-
-    <!-- package to jar -->
-    <target name="jar" depends="compile">
-        <jar destfile="${target.jar}">
-            <fileset dir="${basedir}"
-                     includes="*.xsl" />
-            <metainf dir="${basedir}">
-                <filename name="converter.xml"/>
-            </metainf>
-         </jar>
-    </target>
-
-    <!-- clean up -->
-    <target name="clean">
-        <delete file="${target.jar}"/>
-    </target>
-
-    <target name="all" depends="jar">
-    </target>
-
-</project>
-
diff --git a/xmerge/source/htmlsoff/makefile.mk b/xmerge/source/htmlsoff/makefile.mk
deleted file mode 100644
index 204b3fffa774..000000000000
--- a/xmerge/source/htmlsoff/makefile.mk
+++ /dev/null
@@ -1,35 +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.
-#
-#*************************************************************************
-
-TARGET=htmlsoff
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/source/inc/antbuild.properties b/xmerge/source/inc/antbuild.properties
deleted file mode 100644
index a027bbb60218..000000000000
--- a/xmerge/source/inc/antbuild.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# define how to handle CLASSPATH environment
-# x-no-translate
-build.sysclasspath=ignore
-
-# set wether we want to compile with or without deprecation
-deprecation=on
-
-src.dir=${basedir}/java
-
-build.dir=${out}/class
-target.dir=${build.dir}/${ant.project.name}
-target.jar=${build.dir}/${ant.project.name}.jar
\ No newline at end of file
diff --git a/xmerge/source/inc/antbuild.xml b/xmerge/source/inc/antbuild.xml
deleted file mode 100644
index 4598ae2261a5..000000000000
--- a/xmerge/source/inc/antbuild.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-
diff --git a/xmerge/util/minicalc.mf b/xmerge/source/minicalc/minicalc.mf
index 1f0a0e35e276..1f0a0e35e276 100644
--- a/xmerge/util/minicalc.mf
+++ b/xmerge/source/minicalc/minicalc.mf
diff --git a/xmerge/source/pexcel/build.xml b/xmerge/source/pexcel/build.xml
deleted file mode 100644
index caaf8cefbfcd..000000000000
--- a/xmerge/source/pexcel/build.xml
+++ /dev/null
@@ -1,76 +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 name="pexcel" default="all" basedir=".">
-
-    <property file="../inc/antbuild.properties"/>
-
-    <path id="classpath">
-        <pathelement location="${build.dir}/xmerge.jar"/>
-    </path>
-
-
-    <target name="init" >
-        <mkdir dir="${target.dir}"/>
-    </target>
-
-    <!-- compile java sources in ${package} -->
-    <target name="compile" depends="init">
-        <javac srcdir="${src.dir}"
-               destdir="${target.dir}"
-               debug="${debug}"
-               deprecation="${deprecation}"
-               optimize="${optimize}">
-            <classpath refid="classpath"/>
-        </javac>
-    </target>
-
-    <!-- package to jar -->
-    <target name="jar" depends="compile">
-        <jar destfile="${target.jar}">
-            <fileset dir="${target.dir}"
-                     includes="**/*.class" />
-            <metainf dir="${basedir}">
-                <filename name="converter.xml"/>
-            </metainf>
-         </jar>
-    </target>
-
-    <!-- clean up -->
-    <target name="clean">
-        <delete dir="${class.dir}"/>
-        <delete file="${target.jar}"/>
-    </target>
-
-    <target name="all" depends="jar">
-    </target>
-
-</project>
-
diff --git a/xmerge/source/pocketword/build.xml b/xmerge/source/pocketword/build.xml
deleted file mode 100644
index 51b198c329af..000000000000
--- a/xmerge/source/pocketword/build.xml
+++ /dev/null
@@ -1,76 +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 name="pocketword" default="all" basedir=".">
-
-    <property file="../inc/antbuild.properties"/>
-
-    <path id="classpath">
-        <pathelement location="${build.dir}/xmerge.jar"/>
-    </path>
-
-
-    <target name="init" >
-        <mkdir dir="${target.dir}"/>
-    </target>
-
-    <!-- compile java sources in ${package} -->
-    <target name="compile" depends="init">
-        <javac srcdir="${src.dir}"
-               destdir="${target.dir}"
-               debug="${debug}"
-               deprecation="${deprecation}"
-               optimize="${optimize}">
-            <classpath refid="classpath"/>
-        </javac>
-    </target>
-
-    <!-- package to jar -->
-    <target name="jar" depends="compile">
-        <jar destfile="${target.jar}">
-            <fileset dir="${target.dir}"
-                     includes="**/*.class" />
-            <metainf dir="${basedir}">
-                <filename name="converter.xml"/>
-            </metainf>
-         </jar>
-    </target>
-
-    <!-- clean up -->
-    <target name="clean">
-        <delete dir="${class.dir}"/>
-        <delete file="${target.jar}"/>
-    </target>
-
-    <target name="all" depends="jar">
-    </target>
-
-</project>
-
diff --git a/xmerge/source/pocketword/makefile.mk b/xmerge/source/pocketword/makefile.mk
deleted file mode 100644
index 9db2d15000c6..000000000000
--- a/xmerge/source/pocketword/makefile.mk
+++ /dev/null
@@ -1,35 +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.
-#
-#*************************************************************************
-
-TARGET=pocketword
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/source/xmerge/build.xml b/xmerge/source/xmerge/build.xml
deleted file mode 100644
index 8c46b46ea747..000000000000
--- a/xmerge/source/xmerge/build.xml
+++ /dev/null
@@ -1,92 +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 name="xmerge" default="all" basedir=".">
-
-    <property file="../inc/antbuild.properties"/>
-
-    <property environment="env"/>
-    <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
-    <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
-
-    <path id="classpath">
-        <pathelement location="${env.XML_APIS_JAR}"/>
-        <pathelement location="${env.XERCES_JAR}"/>
-        <pathelement location="${solar.jar}/unoil.jar"/>
-        <pathelement location="${solar.jar}/ridl.jar"/>
-        <pathelement location="${solar.jar}/jurt.jar"/>
-        <pathelement location="${solar.jar}/juh.jar"/>
-    </path>
-
-
-    <target name="init" >
-        <mkdir dir="${target.dir}"/>
-    </target>
-
-    <!-- compile java sources in ${package} -->
-    <target name="compile" depends="init">
-        <javac srcdir="${src.dir}"
-               destdir="${target.dir}"
-               debug="${debug}"
-               deprecation="${deprecation}"
-               optimize="${optimize}">
-            <classpath refid="classpath"/>
-        </javac>
-    </target>
-
-    <!-- package to jar -->
-    <target name="jar" depends="compile">
-        <jar destfile="${target.jar}">
-            <fileset dir="${target.dir}"
-                         includes="**/*.class" />
-            <fileset dir="${src.dir}"
-                         includes="**/*.properties" />
-            <manifest>
-                <attribute name="Main-Class" value="org.openoffice.xmerge.test.Driver"/>
-                <attribute name="Specification-Title" value="OpenOffice XMerge Framework"/>
-                <attribute name="Specification-Vendor" value="OpenOffice.org"/>
-                <attribute name="Specification-Version" value="0.6.0"/>
-                <attribute name="Implementation-Version" value="#IMPL-VERSION#"/>
-                <attribute name="Class-Path" value="xml-apis.jar xercesImpl.jar serializer.jar"/>
-            </manifest>
-         </jar>
-    </target>
-
-    <!-- clean up -->
-    <target name="clean">
-        <delete dir="${class.dir}"/>
-        <delete file="${target.jar}"/>
-    </target>
-
-    <target name="all" depends="jar">
-    </target>
-
-</project>
-
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
deleted file mode 100644
index 525546d2f7fc..000000000000
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
+++ /dev/null
@@ -1,135 +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 name="xmrg_jooxu_registry" default="main" basedir=".">
-
-    <!-- ================================================================= -->
-    <!-- settings                                                          -->
-    <!-- ================================================================= -->
-
-    <!-- project prefix, used for targets and build.lst  -->
-    <property name="prj.prefix" value="xmrg"/>
-
-    <!-- name of this sub target used in recursive builds -->
-    <property name="target" value="xmrg_jooxu_registry"/>
-
-    <!-- relative path to project directory -->
-    <property name="prj" value="../../../../../.."/>
-
-    <!-- start of java source code package structure -->
-    <property name="java.dir" value="${prj}/java"/>
-
-    <!-- path component for current java package -->
-    <property name="package" value="org/openoffice/xmerge/util/registry"/>
-
-    <!-- define how to handle CLASSPATH environment -->
-    <property name="build.sysclasspath" value="ignore"/>
-
-    <property environment="env"/>
-    <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
-    <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
-
-    <!-- classpath settings for javac tasks -->
-    <path id="classpath">
-        <pathelement location="${build.class}"/>
-        <pathelement location="${env.XML_APIS_JAR}"/>
-        <pathelement location="${env.XERCES_JAR}"/>
-    </path>
-
-    <!-- set whether we want to compile with or without deprecation -->
-    <property name="deprecation" value="on"/>
-
-    <!-- ================================================================= -->
-    <!--  solar build environment targets                                  -->
-    <!-- ================================================================= -->
-
-    <target name="build_dir" unless="build.dir">
-        <property name="build.dir" value="${out}"/>
-    </target>
-
-    <target name="solar" depends="build_dir" if="solar.update">
-        <property name="solar.properties"
-                  value="${solar.bin}/solar.properties"/>
-    </target>
-
-    <target name="init" depends="solar">
-        <property name="build.compiler" value="classic"/>
-        <property file="${solar.properties}"/>
-        <property file="${build.dir}/class/solar.properties"/>
-    </target>
-
-    <target name="info">
-        <echo message="--------------------"/>
-        <echo message="${target}"/>
-        <echo message="--------------------"/>
-    </target>
-
-
-    <!-- ================================================================= -->
-    <!-- custom targets                                                    -->
-    <!-- ================================================================= -->
-
-    <!-- the main target, called in recursive builds -->
-    <target name="main" depends="info,prepare,compile"/>
-
-    <!-- prepare output directories -->
-    <target name="prepare" depends="init" if="build.class">
-        <mkdir dir="${build.dir}"/>
-        <mkdir dir="${build.class}"/>
-    </target>
-
-    <!-- compile java sources in ${package} -->
-    <target name="compile" depends="prepare" if="build.class">
-        <javac srcdir="${java.dir}"
-               destdir="${build.class}"
-               debug="${debug}"
-               deprecation="${deprecation}"
-               optimize="${optimize}">
-            <classpath refid="classpath"/>
-            <include name="${package}/ConverterInfo.java"/>
-            <include name="${package}/ConverterInfoMgr.java"/>
-            <include name="${package}/ConverterInfoReader.java"/>
-            <include name="${package}/RegistryException.java"/>
-            <include name="${package}/UnoBridgeConverterInfo.java"/>
-        </javac>
-    </target>
-
-    <!-- clean up -->
-    <target name="clean" depends="prepare">
-        <delete includeEmptyDirs="true">
-            <fileset dir="${build.class}">
-                <patternset>
-                    <include name="${package}/*.class"/>
-                </patternset>
-            </fileset>
-        </delete>
-    </target>
-
-</project>
-
diff --git a/xmerge/source/xmerge/makefile.mk b/xmerge/source/xmerge/makefile.mk
deleted file mode 100644
index 8ff18ad94d5d..000000000000
--- a/xmerge/source/xmerge/makefile.mk
+++ /dev/null
@@ -1,34 +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.
-#
-#*************************************************************************
-
-TARGET=xmerge
-PRJ=../..
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/util/xmerge.mf b/xmerge/source/xmerge/xmerge.mf
index 89d942f17b5c..58afc82bfe36 100644
--- a/xmerge/util/xmerge.mf
+++ b/xmerge/source/xmerge/xmerge.mf
@@ -1,6 +1,4 @@
-Manifest-Version: 1.0
 Main-Class: org.openoffice.xmerge.test.Driver
-Class-Path: xml-apis.jar xercesImpl.jar serializer.jar
 Specification-Title: OpenOffice XMerge Framework
 Specification-Vendor: OpenOffice.org
 Specification-Version: 0.6.0
diff --git a/xmerge/util/build.xml b/xmerge/util/build.xml
deleted file mode 100644
index f15ad3acff08..000000000000
--- a/xmerge/util/build.xml
+++ /dev/null
@@ -1,94 +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 name="xmrg_util" default="main" basedir=".">
-
-    <property file="../source/inc/antbuild.properties"/>
-
-    <property name="javadoc.dir" location="${build.dir}/javadoc"/>
-
-    <property environment="env"/>
-    <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
-    <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
-
-    <path id="classpath">
-        <pathelement location="${env.XML_APIS_JAR}"/>
-        <pathelement location="${env.XERCES_JAR}"/>
-        <pathelement location="${solar.jar}/unoil.jar"/>
-        <pathelement location="${solar.jar}/ridl.jar"/>
-        <pathelement location="${solar.jar}/jurt.jar"/>
-        <pathelement location="${solar.jar}/juh.jar"/>
-        <pathelement location="${build.dir}/xmerge.jar"/>
-    </path>
-
-    <target name="init">
-        <mkdir dir="${javadoc.dir}"/>
-    </target>
-
-    <!-- build javadoc -->
-    <target name="javadoc" depends="init">
-        <javadoc destdir="${javadoc.dir}"
-             verbose="false"
-             author="false"
-             nodeprecated="true"
-             nodeprecatedlist="true"
-             use="true"
-             Doctitle="OpenOffice XMerge API"
-             windowtitle="OpenOffice XMerge API"
-             classpathref="classpath">
-            <fileset dir="../source/bridge" defaultexcludes="yes">
-               <include name="**/*.java"/>
-            </fileset>
-            <fileset dir="../source/xmerge" defaultexcludes="yes">
-               <include name="**/*.java"/>
-            </fileset>
-            <fileset dir="../source/aportisdoc" defaultexcludes="yes">
-               <include name="**/*.java"/>
-            </fileset>
-            <fileset dir="../source/pexcel" defaultexcludes="yes">
-               <include name="**/*.java"/>
-            </fileset>
-            <fileset dir="../source/pocketword" defaultexcludes="yes">
-               <include name="**/*.java"/>
-            </fileset>
-             <link offline="true" href="http://java.sun.com/j2se/1.3/docs/api" packagelistLoc="${solar.doc}/jdk13"/>
-            <bottom><![CDATA[<i>Copyright &#169 2002 OpenOffice.org</i>]]></bottom>
-            <header><![CDATA[<b>OpenOffice.org<br>XMerge API</b>]]></header>
-        </javadoc>
-    </target>
-
-    <target name="main" depends="javadoc">
-    </target>
-
-     <target name="all" depends="javadoc">
-    </target>
-
-    <target name="clean">
-        <delete file="${javadoc.dir}"/>
-    </target>
-
-</project>
-
diff --git a/xmerge/util/makefile.mk b/xmerge/util/makefile.mk
deleted file mode 100644
index 54ed16e3ef8e..000000000000
--- a/xmerge/util/makefile.mk
+++ /dev/null
@@ -1,34 +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.
-#
-#***************************************************************************
-
-TARGET=xmrg_util
-PRJ=..
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/workben/build.xml b/xmerge/workben/build.xml
deleted file mode 100644
index ed8da0ccb444..000000000000
--- a/xmerge/workben/build.xml
+++ /dev/null
@@ -1,128 +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 name="xmrg_workben" default="main" basedir=".">
-
-    <!-- ================================================================= -->
-    <!-- settings                                                          -->
-    <!-- ================================================================= -->
-
-    <!-- project prefix, used for targets and build.lst  -->
-    <property name="prj.prefix" value="xmrg"/>
-
-    <!-- name of this sub target used in recursive builds -->
-    <property name="target" value="xmrg_workben"/>
-
-    <!-- relative path to project directory -->
-    <property name="prj" value=".."/>
-
-    <!-- start of java source code package structure -->
-    <property name="java.dir" value="${prj}/workben"/>
-
-    <!-- path component for current java package -->
-    <property name="package" value="."/>
-
-    <!-- define how to handle CLASSPATH environment -->
-    <property name="build.sysclasspath" value="ignore"/>
-
-    <property environment="env"/>
-    <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
-    <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
-
-    <!-- classpath settings for javac tasks -->
-    <path id="classpath">
-        <pathelement location="${build.class}"/>
-        <pathelement location="${env.XML_APIS_JAR}"/>
-        <pathelement location="${env.XERCES_JAR}"/>
-    </path>
-
-    <!-- set wether we want to compile with or without deprecation -->
-    <property name="deprecation" value="on"/>
-
-    <!-- ================================================================= -->
-    <!--  solar build environment targets                                  -->
-    <!-- ================================================================= -->
-
-    <target name="build_dir" unless="build.dir">
-        <property name="build.dir" value="${out}"/>
-    </target>
-
-    <target name="solar" depends="build_dir" if="solar.update">
-        <property name="solar.properties"
-                  value="${solar.bin}/solar.properties"/>
-    </target>
-
-    <target name="init" depends="solar">
-        <property name="build.compiler" value="classic"/>
-        <property file="${solar.properties}"/>
-        <property file="${build.dir}/class/solar.properties"/>
-    </target>
-
-    <target name="info">
-        <echo message="--------------------"/>
-        <echo message="${target}"/>
-        <echo message="--------------------"/>
-    </target>
-
-
-    <!-- ================================================================= -->
-    <!-- custom targets                                                    -->
-    <!-- ================================================================= -->
-
-    <!-- the main target, called in recursive builds -->
-    <target name="main" depends="info,prepare,compile"/>
-
-    <!-- prepare output directories -->
-    <target name="prepare" depends="init" if="build.class">
-        <mkdir dir="${build.dir}"/>
-        <mkdir dir="${build.class}"/>
-    </target>
-
-    <!-- compile java sources in ${package} and sub packages -->
-    <target name="compile" depends="prepare" if="build.class">
-        <javac srcdir="${java.dir}"
-               destdir="${build.class}"
-               debug="${debug}"
-               deprecation="${deprecation}"
-               optimize="${optimize}">
-            <classpath refid="classpath"/>
-            <include name="XmlDiff.java"/>
-        </javac>
-    </target>
-
-    <!-- clean up -->
-    <target name="clean" depends="prepare">
-        <delete includeEmptyDirs="true">
-            <fileset dir="${build.class}">
-                <patternset>
-                    <include name="${package}/**/*.class"/>
-                </patternset>
-            </fileset>
-        </delete>
-    </target>
-
-</project>