convert xmerge to gbuild and add to tail_build

19 files changed, 9 insertions, 851 deletions

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/source/minicalc/minicalc.mf b/xmerge/source/minicalc/minicalc.mf
new file mode 100644
index 000000000000..1f0a0e35e276
--- /dev/null
+++ b/xmerge/source/minicalc/minicalc.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: jmc.jar
+
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/pexcel/makefile.mk b/xmerge/source/pexcel/makefile.mk
deleted file mode 100644
index 7f51a43e7530..000000000000
--- a/xmerge/source/pexcel/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=pexcel
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
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/source/xmerge/xmerge.mf b/xmerge/source/xmerge/xmerge.mf
new file mode 100644
index 000000000000..58afc82bfe36
--- /dev/null
+++ b/xmerge/source/xmerge/xmerge.mf
@@ -0,0 +1,6 @@
+Main-Class: org.openoffice.xmerge.test.Driver
+Specification-Title: OpenOffice XMerge Framework
+Specification-Vendor: OpenOffice.org
+Specification-Version: 0.6.0
+Implementation-Version: #IMPL-VERSION#
+