gbuildification of appache_commons

Change-Id: I517c808c9ea799aac0d2cd2b3bb6c18564c76823

21 files changed, 330 insertions, 319 deletions

diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk
new file mode 100644
index 000000000000..7e07d3923cd3
--- /dev/null
+++ b/apache-commons/ExternalProject_apache_commons_codec.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec))
+
+$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_codec,apache_commons_codec))
+
+$(eval $(call gb_ExternalProject_register_targets,apache_commons_codec,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,apache_commons_codec,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_codec)" && \
+	ANT_OPTS+="-Dfile.encoding=ISO-8859-1" \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		$(if $(debug),-Dbuild.debug="on") \
+		jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk
new file mode 100644
index 000000000000..e1a55bdee7ff
--- /dev/null
+++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient))
+
+$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_codec,apache_commons_httpclient))
+
+$(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,apache_commons_codec))
+$(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,apache_commons_logging))
+
+$(eval $(call gb_ExternalProject_register_targets,apache_commons_httpclient,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)" && \
+	ANT_OPTS+="-Dfile.encoding=ISO-8859-1" \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar" \
+		-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.3.jar" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		$(if $(debug),-Dbuild.debug="on") \
+		dist && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/ExternalProject_apache_commons_lang.mk b/apache-commons/ExternalProject_apache_commons_lang.mk
new file mode 100644
index 000000000000..87ac5e09dc71
--- /dev/null
+++ b/apache-commons/ExternalProject_apache_commons_lang.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang))
+
+$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_lang,apache_commons_lang))
+
+$(eval $(call gb_ExternalProject_register_targets,apache_commons_lang,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,apache_commons_lang,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_lang)" && \
+	ANT_OPTS+="-Dfile.encoding=ISO-8859-1" \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		$(if $(debug),-Dbuild.debug="on") \
+		jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/apache-commons/ExternalProject_apache_commons_logging.mk
new file mode 100644
index 000000000000..d51c3a9811c0
--- /dev/null
+++ b/apache-commons/ExternalProject_apache_commons_logging.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for RSCREVISION
+include $(SOLARENV)/inc/minor.mk
+
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging))
+
+$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_logging,apache_commons_logging))
+
+$(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\
+	build \
+))
+
+$(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
+	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_logging)" && \
+	ANT_OPTS+="-Dfile.encoding=ISO-8859-1" \
+	"$(ANT)" \
+		-q \
+		-f build.xml \
+		-Dbuild.label="build-$(RSCREVISION)" \
+		$(if $(filter YES,$(SYSTEM_TOMCAT))\
+			,-Dservletapi.jar=$(SERVLETAPI_JAR) \
+			,-Dservletapi.jar=$(SOLARVER)/$(INPATH)/bin/servlet-api.jar \
+		)\
+		$(if $(filter yes,$(JAVACISGCJ))\
+			,-Dbuild.compiler=gcj \
+			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
+				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
+		) \
+		$(if $(debug),-Dbuild.debug="on") \
+		compile build-jar && \
+	touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Makefile b/apache-commons/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/apache-commons/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Module_apache_commons.mk b/apache-commons/Module_apache_commons.mk
new file mode 100644
index 000000000000..07cba6a99424
--- /dev/null
+++ b/apache-commons/Module_apache_commons.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,apache_commons))
+
+ifneq ($(SOLAR_JAVA),)
+$(info "f:$(filter APACHE_COMMONS,$(BUILD_TYPE))")
+ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),)
+$(eval $(call gb_Module_add_targets,apache_commons,\
+	ExternalProject_apache_commons_codec \
+	ExternalProject_apache_commons_httpclient \
+	ExternalProject_apache_commons_lang \
+	ExternalProject_apache_commons_logging \
+	Package_apache_commons_codec \
+	Package_apache_commons_httpclient \
+	Package_apache_commons_lang \
+	Package_apache_commons_logging \
+	UnpackedTarball_apache_commons_codec \
+	UnpackedTarball_apache_commons_httpclient \
+	UnpackedTarball_apache_commons_lang \
+	UnpackedTarball_apache_commons_logging \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Package_apache_commons_codec.mk b/apache-commons/Package_apache_commons_codec.mk
new file mode 100644
index 000000000000..aaf3b7f8f9ca
--- /dev/null
+++ b/apache-commons/Package_apache_commons_codec.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,apache_commons_codec_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_codec)))
+
+$(eval $(call gb_Package_use_external_project,apache_commons_codec_inc,apache_commons_codec))
+
+$(eval $(call gb_Package_add_file,apache_commons_codec_inc,bin/commons-codec-1.3.jar,dist/commons-codec-1.3.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Package_apache_commons_httpclient.mk b/apache-commons/Package_apache_commons_httpclient.mk
new file mode 100644
index 000000000000..dd21d777a97e
--- /dev/null
+++ b/apache-commons/Package_apache_commons_httpclient.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,apache_commons_httpclient_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)))
+
+$(eval $(call gb_Package_use_external_project,apache_commons_httpclient_inc,apache_commons_httpclient))
+
+$(eval $(call gb_Package_add_file,apache_commons_httpclient_inc,bin/commons-httpclient-3.1.jar,dist/commons-httpclient.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Package_apache_commons_lang.mk b/apache-commons/Package_apache_commons_lang.mk
new file mode 100644
index 000000000000..8f93b9be6878
--- /dev/null
+++ b/apache-commons/Package_apache_commons_lang.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,apache_commons_lang_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)))
+
+$(eval $(call gb_Package_use_external_project,apache_commons_lang_inc,apache_commons_lang))
+
+$(eval $(call gb_Package_add_file,apache_commons_lang_inc,bin/commons-lang-2.3.jar,dist/commons-lang-2.3.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Package_apache_commons_logging.mk b/apache-commons/Package_apache_commons_logging.mk
new file mode 100644
index 000000000000..24a14eaea950
--- /dev/null
+++ b/apache-commons/Package_apache_commons_logging.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,apache_commons_logging_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)))
+
+$(eval $(call gb_Package_use_external_project,apache_commons_logging_inc,apache_commons_logging))
+
+$(eval $(call gb_Package_add_file,apache_commons_logging_inc,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/UnpackedTarball_apache_commons_codec.mk b/apache-commons/UnpackedTarball_apache_commons_codec.mk
new file mode 100644
index 000000000000..2e7ae659ad14
--- /dev/null
+++ b/apache-commons/UnpackedTarball_apache_commons_codec.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_codec))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_codec,$(APACHE_COMMONS_CODEC_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_codec,\
+	apache-commons/patches/codec.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/UnpackedTarball_apache_commons_httpclient.mk b/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
new file mode 100644
index 000000000000..a68c071226f7
--- /dev/null
+++ b/apache-commons/UnpackedTarball_apache_commons_httpclient.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_httpclient))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_httpclient,$(APACHE_COMMONS_HTTPCLIENT_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/UnpackedTarball_apache_commons_lang.mk b/apache-commons/UnpackedTarball_apache_commons_lang.mk
new file mode 100644
index 000000000000..ade8fe43a7fe
--- /dev/null
+++ b/apache-commons/UnpackedTarball_apache_commons_lang.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_lang))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_lang,$(APACHE_COMMONS_LANG_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/UnpackedTarball_apache_commons_logging.mk b/apache-commons/UnpackedTarball_apache_commons_logging.mk
new file mode 100644
index 000000000000..27fe272e202b
--- /dev/null
+++ b/apache-commons/UnpackedTarball_apache_commons_logging.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_logging))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_logging,$(APACHE_COMMONS_LOGGING_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_logging,\
+	build.xml \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_logging,\
+	apache-commons/patches/logging.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk
deleted file mode 100644
index fc59a3a1437f..000000000000
--- a/apache-commons/java/codec/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=apache-commons
-TARGET=commons-codec
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
-.INCLUDE : antsettings.mk
-
-.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=commons-codec-1.3-src
-TARFILE_MD5=af3c3acf618de6108d65fcdc92b492e1
-
-TARFILE_ROOTDIR=commons-codec-1.3
-
-PATCH_FILES=$(PRJ)$/patches$/codec.patch
-
-OUT2CLASS=dist$/commons-codec-1.3.jar
-
-ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
-.EXPORT : ANT_OPTS
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
-.INCLUDE : tg_ext.mk
-.ENDIF
-
diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk
deleted file mode 100644
index c57862151d64..000000000000
--- a/apache-commons/java/httpclient/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=apache-commons
-TARGET=commons-httpclient
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
-.INCLUDE : antsettings.mk
-
-TAR!:=$(GNUTAR)
-
-.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=commons-httpclient-3.1-src
-TARFILE_MD5=2c9b0f83ed5890af02c0df1c1776f39b
-
-TARFILE_ROOTDIR=commons-httpclient-3.1
-
-OUT2CLASS=dist$/commons-httpclient.jar
-
-COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar
-COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar
-
-ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
-.EXPORT : ANT_OPTS
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
-.ELSE
-BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"  -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
-.INCLUDE : tg_ext.mk
-.ENDIF
-
diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk
deleted file mode 100644
index 099bcd493821..000000000000
--- a/apache-commons/java/lang/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=apache-commons
-TARGET=commons-lang
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
-.INCLUDE : antsettings.mk
-
-TAR!:=$(GNUTAR)
-
-.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=commons-lang-2.3-src
-TARFILE_MD5=2ae988b339daec234019a7066f96733e
-
-TARFILE_ROOTDIR=commons-lang-2.3-src
-
-OUT2CLASS=dist$/commons-lang-2.3.jar
-
-ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
-.EXPORT : ANT_OPTS
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
-.INCLUDE : tg_ext.mk
-.ENDIF
-
diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk
deleted file mode 100644
index 670ccbbb726c..000000000000
--- a/apache-commons/java/logging/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=apache-commons
-TARGET=commons-logging
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
-.INCLUDE : antsettings.mk
-
-.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=commons-logging-1.1.1-src
-TARFILE_MD5=3c219630e4302863a9a83d0efde889db
-
-TARFILE_ROOTDIR=commons-logging-1.1.1-src
-
-PATCH_FILES=$(PRJ)$/patches$/logging.patch
-
-CONVERTFILES=build.xml
-                
-OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar
-
-ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
-.EXPORT : ANT_OPTS
-
-.IF "$(SYSTEM_TOMCAT)" != "YES"
-SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar
-.ENDIF
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dservletapi.jar=$(SERVLETAPI_JAR) -f $(ANT_BUILDFILE) compile build-jar
-.ELSE
-BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) -Dservletapi.jar=$(SERVLETAPI_JAR) compile build-jar
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
-.INCLUDE : tg_ext.mk
-.ENDIF
-
diff --git a/apache-commons/prj/build.lst b/apache-commons/prj/build.lst
index c509ce0336dd..6726cb6c4d5d 100644
--- a/apache-commons/prj/build.lst
+++ b/apache-commons/prj/build.lst
@@ -1,6 +1,3 @@
 ac      apache-commons  :       solenv TOMCAT:tomcat NULL
-ac	apache-commons								usr1	-	all	ac_mkout 							NULL
-ac	apache-commons\java\codec					nmake	-	all	ac_codec								NULL
-ac	apache-commons\java\lang					nmake	-	all	ac_lang									NULL
-ac	apache-commons\java\logging					nmake	-	all	ac_logging								NULL
-ac	apache-commons\java\httpclient					nmake	-	all	ac_httpclient ac_logging ac_codec					NULL
+ac	apache-commons\prj			nmake	-	all	ac_prj	 NULL
+
diff --git a/apache-commons/prj/d.lst b/apache-commons/prj/d.lst
index 03eec2a853ad..e69de29bb2d1 100644
--- a/apache-commons/prj/d.lst
+++ b/apache-commons/prj/d.lst
@@ -1,5 +0,0 @@
-..\%__SRC%\class\commons-logging-1.1.1-SNAPSHOT.jar %_DEST%\bin\commons-logging-1.1.1.jar
-..\%__SRC%\class\commons-codec-1.3.jar %_DEST%\bin\commons-codec-1.3.jar
-..\%__SRC%\class\commons-httpclient.jar %_DEST%\bin\commons-httpclient-3.1.jar
-..\%__SRC%\class\commons-lang-2.3.jar %_DEST%\bin\commons-lang-2.3.jar
-
diff --git a/apache-commons/prj/dmake b/apache-commons/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/apache-commons/prj/dmake
+++ /dev/null