Thu Sep 27 00:32:39 PDT 2012

Makefile.top                                                |    2 
 apache-commons/ExternalProject_apache_commons_codec.mk      |   37 +++++
 apache-commons/ExternalProject_apache_commons_httpclient.mk |   42 ++++++
 apache-commons/ExternalProject_apache_commons_lang.mk       |   37 +++++
 apache-commons/ExternalProject_apache_commons_logging.mk    |   41 ++++++
 apache-commons/Makefile                                     |    7 +
 apache-commons/Module_apache_commons.mk                     |   32 ++++
 apache-commons/Package_apache_commons_codec.mk              |   16 ++
 apache-commons/Package_apache_commons_httpclient.mk         |   16 ++
 apache-commons/Package_apache_commons_lang.mk               |   16 ++
 apache-commons/Package_apache_commons_logging.mk            |   16 ++
 apache-commons/UnpackedTarball_apache_commons_codec.mk      |   18 ++
 apache-commons/UnpackedTarball_apache_commons_httpclient.mk |   14 ++
 apache-commons/UnpackedTarball_apache_commons_lang.mk       |   14 ++
 apache-commons/UnpackedTarball_apache_commons_logging.mk    |   22 +++
 apache-commons/java/codec/makefile.mk                       |   75 -----------
 apache-commons/java/httpclient/makefile.mk                  |   78 -----------
 apache-commons/java/lang/makefile.mk                        |   75 -----------
 apache-commons/java/logging/makefile.mk                     |   81 ------------
 apache-commons/prj/build.lst                                |    7 -
 apache-commons/prj/d.lst                                    |    5 
 config_host.mk.in                                           |    4 
 configure.in                                                |    8 +
 ooo.lst.in                                                  |    9 -
 solenv/gbuild/ExternalProject.mk                            |    6 
 25 files changed, 353 insertions(+), 325 deletions(-)

New commits:
commit 6d64bfd8c0086a9d3e8a05ecf49b1af84ec58436
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Sep 27 02:31:15 2012 -0500

    gbuildification of appache_commons
    
    Change-Id: I517c808c9ea799aac0d2cd2b3bb6c18564c76823

diff --git a/Makefile.top b/Makefile.top
index da83b1b..642ec00 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -35,6 +35,7 @@ accessibility\
 afms\
 android\
 animations\
+apache-commons\
 apple_remote\
 autodoc\
 avmedia\
@@ -192,7 +193,6 @@ xmlsecurity\
 xsltml\
 
 dmake_modules:=\
-apache-commons\
 beanshell\
 berkeleydb\
 binfilter \
diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk
new file mode 100644
index 0000000..7e07d39
--- /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 0000000..e1a55bd
--- /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 0000000..87ac5e0
--- /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 0000000..d51c3a9
--- /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 0000000..ccb1c85
--- /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 0000000..07cba6a
--- /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 0000000..aaf3b7f
--- /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 0000000..dd21d77
--- /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 0000000..8f93b9b
--- /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 0000000..24a14ea
--- /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 0000000..2e7ae65
--- /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 0000000..a68c071
--- /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 0000000..ade8fe4
--- /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 0000000..27fe272
--- /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 fc59a3a..0000000
--- 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 c578621..0000000
--- 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 099bcd4..0000000
--- 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 670ccbb..0000000
--- 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 c509ce0..6726cb6 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 03eec2a..e69de29 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 e69de29..0000000
diff --git a/config_host.mk.in b/config_host.mk.in
index 2d9577f..6b0a4e8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -21,6 +21,10 @@ export ANDROID_NDK_HOME=@ANDROID_NDK_HOME@
 export ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=@ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR@
 export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@
 export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@
+export APACHE_COMMONS_CODEC_TARBALL=@APACHE_COMMONS_CODEC_TARBALL@
+export APACHE_COMMONS_HTTPCLIENT_TARBALL=@APACHE_COMMONS_HTTPCLIENT_TARBALL@
+export APACHE_COMMONS_LANG_TARBALL=@APACHE_COMMONS_LANG_TARBALL@
+export APACHE_COMMONS_LOGGING_TARBALL=@APACHE_COMMONS_LOGGING_TARBALL@
 export AR=@AR@
 export ASSERT_ALWAYS_ABORT=@ASSERT_ALWAYS_ABORT@
 export ATL_INCLUDE=@ATL_INCLUDE@
diff --git a/configure.in b/configure.in
index 75f9c88..37c5f09 100644
--- a/configure.in
+++ b/configure.in
@@ -9931,9 +9931,17 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
     else
         AC_MSG_RESULT([internal])
         SYSTEM_APACHE_COMMONS=NO
+        APACHE_COMMONS_CODEC_TARBALL=af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+        APACHE_COMMONS_HTTPCLIENT_TARBALL=2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+        APACHE_COMMONS_LANG_TARBALL=2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+        APACHE_COMMONS_LOGGING_TARBALL=3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
         BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
     fi
 fi
+AC_SUBST(APACHE_COMMONS_CODEC_TARBALL)
+AC_SUBST(APACHE_COMMONS_HTTPCLIENT_TARBALL)
+AC_SUBST(APACHE_COMMONS_LANG_TARBALL)
+AC_SUBST(APACHE_COMMONS_LOGGING_TARBALL)
 AC_SUBST(SYSTEM_APACHE_COMMONS)
 AC_SUBST(COMMONS_CODEC_JAR)
 AC_SUBST(COMMONS_LANG_JAR)
diff --git a/ooo.lst.in b/ooo.lst.in
index 95a4b86..0c4e9a1 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -2,7 +2,6 @@ http://dev-www.libreoffice.org/src
 a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
 c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
-0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 @AFMS_TARBALL@
@@ -12,8 +11,8 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+ at APACHE_COMMONS_HTTPCLIENT_TARBALL@
+ at APACHE_COMMONS_LANG_TARBALL@
 @FONT_LINLIBERTINEG_TARBALL@
 @FONT_LIBERATION_NARROW_TARBALL@
 @FONT_LIBERATION_TARBALL@
@@ -22,7 +21,7 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+ at APACHE_COMMONS_LOGGING_TARBALL@
 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
 @CLUCENE_TARBALL@
 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
@@ -38,7 +37,7 @@ fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
 a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
 @XSLTML_TARBALL@
 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+ at APACHE_COMMONS_CODEC_TARBALL@
 bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
 c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
 ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
commit ee22be5d7f1e9077c139a9ca18cdb9e0ec75a766
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Sep 27 02:30:56 2012 -0500

    add gb_ExternalProject_use_external to deal with ExternalProject inter-dep
    
    One may have multiple ExternalProject in a given module
    and these ExternalProject may have dependencies among each others
    This api allow to explicit such dependencies so that the
    ExternalProjects in a given module are built in the right order
    
    Change-Id: Ib8a1b9bdcad0dda08b6fe133113b01a80e02421c

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 5731cbf..d35d238 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -103,4 +103,10 @@ $(foreach target,$(2),$(call gb_ExternalProject_register_target,$(1),$(target)))
 
 endef
 
+# Make an external Project depend on another external project
+define gb_ExternalProject_use_external
+$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_ExternalProject_get_target,$(2))
+
+endef
+
 # vim: set noet sw=4 ts=4:
