From 4fd868fdfca690e9b0f159b2beadde5920897ab4 Mon Sep 17 00:00:00 2001

From: Stephan Bergmann <sbergman@redhat.com>

Date: Sun, 11 Apr 2021 09:20:13 +0200

Subject: [PATCH] Get rid of apache-commons-logging

...using Java 1.4 java.util.logging.Logger instead also for the last remaining

uses in reportbuilder.

(The mention in swext/mediawiki/src/THIRDPARTYLICENSEREADME.html was presumably

a leftover from 4b6ceed4a4a9b152905a8b1712ffb9bd61373c16 "swext: Wiki Publisher

does not use those apache-commons libraries".)

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113939

Tested-by: Jenkins

Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

(cherry picked from commit 6de0b1710adfba82c96b75a5da6f52633a54c692)

Conflicts:

	readlicense_oo/license/NOTICE

	swext/mediawiki/src/THIRDPARTYLICENSEREADME.html

Change-Id: Ia0bc598fe5844ced11cae497548ec7d09453a99d

---

 Makefile.fetch                                |  1 -

 RepositoryExternal.mk                         | 26 ----------

 config_host.mk.in                             |  3 --

 configure.ac                                  | 40 ---------------

 distro-configs/LibreOfficeFlatpak.conf        |  1 -

 download.lst                                  |  2 -

 external/Module_external.mk                   |  1 -

 .../ExternalPackage_apache_commons_logging.mk | 16 ------

 .../ExternalProject_apache_commons_logging.mk | 32 ------------

 external/apache-commons/Makefile              |  7 ---

 .../apache-commons/Module_apache-commons.mk   | 18 -------

 external/apache-commons/README                |  1 -

 .../UnpackedTarball_apache_commons_logging.mk | 22 ---------

 external/apache-commons/patches/logging.patch | 46 -----------------

 readlicense_oo/license/NOTICE                 |  8 ---

 readlicense_oo/license/license.xml            |  6 ---

 reportbuilder/Jar_reportbuilder.mk            |  1 -

 .../report/SDBCReportDataFactory.java         |  7 +--

 .../libreoffice/report/StorageRepository.java | 48 +++++++++---------

 .../libreoffice/report/pentaho/Manifest.mf    |  2 +-

 .../report/pentaho/PentahoReportJob.java      | 10 ++--

 .../report/pentaho/SOReportJobFactory.java    |  9 ++--

 .../layoutprocessor/FormatValueUtility.java   |  2 +-

 .../FormattedTextLayoutController.java        |  7 ++-

 .../ImageElementLayoutController.java         | 19 ++++---

 .../report/pentaho/output/ImageProducer.java  | 23 ++++-----

 .../output/OfficeDocumentReportTarget.java    | 23 ++++-----

 .../report/pentaho/output/OleProducer.java    | 12 ++---

 .../report/pentaho/output/StyleUtilities.java | 10 ++--

 .../SpreadsheetRawReportTarget.java           |  2 +-

 .../office/DocumentContentReadHandler.java    | 13 +++--

 solenv/flatpak-manifest.in                    |  6 ---

 .../src/THIRDPARTYLICENSEREADME.html          | 49 -------------------

 33 files changed, 82 insertions(+), 391 deletions(-)

 delete mode 100644 external/apache-commons/ExternalPackage_apache_commons_logging.mk

 delete mode 100644 external/apache-commons/ExternalProject_apache_commons_logging.mk

 delete mode 100644 external/apache-commons/Makefile

 delete mode 100644 external/apache-commons/Module_apache-commons.mk

 delete mode 100644 external/apache-commons/README

 delete mode 100644 external/apache-commons/UnpackedTarball_apache_commons_logging.mk

 delete mode 100644 external/apache-commons/patches/logging.patch

diff --git a/Makefile.fetch b/Makefile.fetch

index 0a6202a4b3c7..924927bb4fb5 100644

--- a/Makefile.fetch

+++ b/Makefile.fetch

@@ -101,7 +101,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S

 	@date >> $(fetch_LOGFILE)

 	$(foreach item, \

 		$(call fetch_Optional,ABW,ABW_TARBALL) \

-		$(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_LOGGING_TARBALL) \

 		$(call fetch_Optional,APR,APR_TARBALL) \

 		$(call fetch_Optional,APR,APR_UTIL_TARBALL) \

 		$(call fetch_Optional,BOOST,BOOST_TARBALL) \

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk

index ad3febbae41b..d2fe7e044dfb 100644

--- a/RepositoryExternal.mk

+++ b/RepositoryExternal.mk

@@ -3723,32 +3723,6 @@ endif # SYSTEM_RHINO

 endif

-ifneq ($(SYSTEM_APACHE_COMMONS),)

-

-define gb_Jar__use_commons-logging

-$(call gb_Jar_use_system_jar,$(1),$(COMMONS_LOGGING_JAR))

-endef

-gb_ExternalProject__use_commons-logging :=

-

-else # !SYSTEM_APACHE_COMMONS

-

-ifeq ($(ENABLE_JAVA),TRUE)

-$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\

-	commons-logging-$(COMMONS_LOGGING_VERSION) \

-))

-endif

-

-define gb_Jar__use_commons-logging

-$(call gb_Jar_use_external_project,$(1),apache_commons_logging)

-$(call gb_Jar_use_jar,$(1),commons-logging-$(COMMONS_LOGGING_VERSION))

-endef

-define gb_ExternalProject__use_commons-logging

-$(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging)

-endef

-

-endif # SYSTEM_APACHE_COMMONS

-

-

 ifneq ($(SYSTEM_JFREEREPORT),)

 define gb_Jar__use_flow-engine

diff --git a/config_host.mk.in b/config_host.mk.in

index 42f4511a62e8..c9b3aa015123 100644

--- a/config_host.mk.in

+++ b/config_host.mk.in

@@ -77,8 +77,6 @@ export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@

 export LIBCMIS_CFLAGS=$(gb_SPACE)@LIBCMIS_CFLAGS@

 export LIBCMIS_LIBS=$(gb_SPACE)@LIBCMIS_LIBS@

 export COM=@COM@

-export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@

-export COMMONS_LOGGING_VERSION=@COMMONS_LOGGING_VERSION@

 export COMPATH=@COMPATH@

 export COMPILER_PLUGINS=@COMPILER_PLUGINS@

 export COMPILER_PLUGINS_ANALYZER_PCH=@COMPILER_PLUGINS_ANALYZER_PCH@

@@ -546,7 +544,6 @@ export STRIP=@STRIP@

 export STRIP_COMPONENTS=@STRIP_COMPONENTS@

 export SYSBASE=@SYSBASE@

 export SYSTEM_ABW=@SYSTEM_ABW@

-export SYSTEM_APACHE_COMMONS=@SYSTEM_APACHE_COMMONS@

 export SYSTEM_APR=@SYSTEM_APR@

 export SYSTEM_BLUEZ=@SYSTEM_BLUEZ@

 export SYSTEM_BOOST=@SYSTEM_BOOST@

diff --git a/configure.ac b/configure.ac

index 11d93b7ba6eb..1cb0a61ad9c2 100644

--- a/configure.ac

+++ b/configure.ac

@@ -2076,11 +2076,6 @@ AC_ARG_WITH(system-gpgmepp,

         [Use gpgmepp already on system]),,

     [with_system_gpgmepp="$with_system_libs"])

-AC_ARG_WITH(system-apache-commons,

-    AS_HELP_STRING([--with-system-apache-commons],

-        [Use Apache commons libraries already on system.]),,

-    [with_system_apache_commons="$with_system_jars"])

-

 AC_ARG_WITH(system-mariadb,

     AS_HELP_STRING([--with-system-mariadb],

         [Use MariaDB/MySQL libraries already on system.]),,

@@ -2158,11 +2153,6 @@ AC_ARG_WITH(rhino-jar,

         [Specify path to jarfile manually.]),

     RHINO_JAR=$withval)

-AC_ARG_WITH(commons-logging-jar,

-    AS_HELP_STRING([--with-commons-logging-jar=JARFILE],

-        [Specify path to jarfile manually.]),

-    COMMONS_LOGGING_JAR=$withval)

-

 AC_ARG_WITH(system-jfreereport,

     AS_HELP_STRING([--with-system-jfreereport],

         [Use JFreeReport already on system.]),,

@@ -12298,36 +12288,6 @@ AC_SUBST(LIBREPOSITORY_JAR)

 AC_SUBST(LIBFONTS_JAR)

 AC_SUBST(LIBSERIALIZER_JAR)

-# this has to be here because both the Wiki Publisher and the SRB use

-# commons-logging

-COMMONS_LOGGING_VERSION=1.2

-if test "$ENABLE_REPORTBUILDER" = "TRUE"; then

-    AC_MSG_CHECKING([which Apache commons-* libs to use])

-    if test "$with_system_apache_commons" = "yes"; then

-        SYSTEM_APACHE_COMMONS=TRUE

-        AC_MSG_RESULT([external])

-        if test -z $COMMONS_LOGGING_JAR; then

-            if test -f /usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar; then

-               COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-${COMMONS_LOGGING_VERSION}.jar

-           elif test -f /usr/share/java/commons-logging.jar; then

-                COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar

-            else

-                AC_MSG_ERROR(commons-logging.jar replacement not found.)

-            fi

-        elif ! test -f $COMMONS_LOGGING_JAR; then

-            AC_MSG_ERROR(commons-logging.jar not found.)

-        fi

-    else

-        AC_MSG_RESULT([internal])

-        SYSTEM_APACHE_COMMONS=

-        BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS"

-        NEED_ANT=TRUE

-    fi

-fi

-AC_SUBST(SYSTEM_APACHE_COMMONS)

-AC_SUBST(COMMONS_LOGGING_JAR)

-AC_SUBST(COMMONS_LOGGING_VERSION)

-

 # scripting provider for BeanShell?

 AC_MSG_CHECKING([whether to build support for scripts in BeanShell])

 if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then

diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf

index 81604de9f1f7..97bfaba200fc 100644

--- a/distro-configs/LibreOfficeFlatpak.conf

+++ b/distro-configs/LibreOfficeFlatpak.conf

@@ -10,7 +10,6 @@

 --without-export-validation

 --without-junit

 --without-lxml

---without-system-apache-commons

 --without-system-beanshell

 --without-system-bluez

 --without-system-boost

diff --git a/download.lst b/download.lst

index c474e9f60208..f74d49e8dfcb 100644

--- a/download.lst

+++ b/download.lst

@@ -5,8 +5,6 @@

 export ABW_SHA256SUM := e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed

 export ABW_TARBALL := libabw-0.1.3.tar.xz

-export APACHE_COMMONS_LOGGING_SHA256SUM := 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81

-export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz

 export APR_SHA256SUM := 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb

 export APR_TARBALL := apr-1.5.2.tar.gz

 export APR_UTIL_SHA256SUM := 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19

diff --git a/external/Module_external.mk b/external/Module_external.mk

index 1c722a325c2d..185974271b93 100644

--- a/external/Module_external.mk

+++ b/external/Module_external.mk

@@ -16,7 +16,6 @@ endif

 $(eval $(call gb_Module_add_moduledirs,external,\

 	$(call gb_Helper_optional,XMLSEC,xmlsec) \

 	$(call gb_Helper_optional,ABW,libabw) \

-	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \

 	$(call gb_Helper_optional,APR,apr) \

 	$(call gb_Helper_optional,BOOST,boost) \

 	$(call gb_Helper_optional,BOX2D,box2d) \

diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk

deleted file mode 100644

index 2bff13b93c66..000000000000

--- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk

+++ /dev/null

@@ -1,16 +0,0 @@

-# -*- 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_ExternalPackage_ExternalPackage,apache_commons_logging,apache_commons_logging))

-

-$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging,apache_commons_logging))

-

-$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-$(COMMONS_LOGGING_VERSION).jar,target/commons-logging-$(COMMONS_LOGGING_VERSION).jar))

-

-# vim: set noet sw=4 ts=4:

diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk

deleted file mode 100644

index 7c689d18c443..000000000000

--- a/external/apache-commons/ExternalProject_apache_commons_logging.mk

+++ /dev/null

@@ -1,32 +0,0 @@

-# -*- 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_ExternalProject_ExternalProject,apache_commons_logging))

-

-$(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\

-	build \

-))

-

-$(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :

-	$(call gb_Trace_StartRange,apache_commons_logging,EXTERNAL)

-	$(call gb_ExternalProject_run,build,\

-	JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \

-	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \

-	$(ICECREAM_RUN) "$(ANT)" \

-		$(if $(verbose),-v,-q) \

-		-f build.xml \

-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \

-		-Dant.build.javac.source=$(JAVA_SOURCE_VER) \

-		-Dant.build.javac.target=$(JAVA_TARGET_VER) \

-		$(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \

-		compile build-jar \

-	)

-	$(call gb_Trace_EndRange,apache_commons_logging,EXTERNAL)

-

-# vim: set noet sw=4 ts=4:

diff --git a/external/apache-commons/Makefile b/external/apache-commons/Makefile

deleted file mode 100644

index e4968cf85fb6..000000000000

--- a/external/apache-commons/Makefile

+++ /dev/null

@@ -1,7 +0,0 @@

-# -*- 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/external/apache-commons/Module_apache-commons.mk b/external/apache-commons/Module_apache-commons.mk

deleted file mode 100644

index 45aabe229b03..000000000000

--- a/external/apache-commons/Module_apache-commons.mk

+++ /dev/null

@@ -1,18 +0,0 @@

-# -*- 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))

-

-$(eval $(call gb_Module_add_targets,apache-commons,\

-	ExternalPackage_apache_commons_logging \

-	ExternalProject_apache_commons_logging \

-	UnpackedTarball_apache_commons_logging \

-))

-

-# vim: set noet sw=4 ts=4:

diff --git a/external/apache-commons/README b/external/apache-commons/README

deleted file mode 100644

index 18944aca4af7..000000000000

--- a/external/apache-commons/README

+++ /dev/null

@@ -1 +0,0 @@

-Java library; used for logging in Extensions, from [http://commons.apache.org/]

diff --git a/external/apache-commons/UnpackedTarball_apache_commons_logging.mk b/external/apache-commons/UnpackedTarball_apache_commons_logging.mk

deleted file mode 100644

index 1d5ad3dc2d9d..000000000000

--- a/external/apache-commons/UnpackedTarball_apache_commons_logging.mk

+++ /dev/null

@@ -1,22 +0,0 @@

-# -*- 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),,apache-commons))

-

-$(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_logging,\

-	build.xml \

-))

-

-$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_logging,\

-	external/apache-commons/patches/logging.patch \

-))

-

-# vim: set noet sw=4 ts=4:

diff --git a/external/apache-commons/patches/logging.patch b/external/apache-commons/patches/logging.patch

deleted file mode 100644

index c225e5a30338..000000000000

--- a/external/apache-commons/patches/logging.patch

+++ /dev/null

@@ -1,46 +0,0 @@

---- misc/commons-logging-1.1.1-src/build.xml   2007-11-22 00:27:52.000000000 +0100

-+++ misc/build/commons-logging-1.1.1-src/build.xml     2008-06-24 14:23:56.316301736 +0200

-@@ -129,12 +129,6 @@

-   

- 

- 

--  

--  <property name="target.version" value="1.2"/>

--

--  

--  <property name="source.version" value="1.2"/>

--

-   

-   <property name="compile.debug"           value="true"/>

- 

-@@ -283,6 +277,10 @@

-                classpathref="compile.classpath"

-                classname="org.apache.avalon.framework.logger.Logger"/>

- 

-+    

-+               classpathref="compile.classpath"

-+               classname="javax.servlet.ServletContextListener"/>

-+

-     <available file="${log4j12.jar}" property="log4j12.present"/>

-     <available file="${log4j13.jar}" property="log4j13.present"/>

-     <available file="${build.home}/docs" property="maven.generated.docs.present"/>

-@@ -362,8 +360,8 @@

-            debug="${compile.debug}"

-            deprecation="${compile.deprecation}"

-            optimize="${compile.optimize}"

--           source="${source.version}"

--           target="${target.version}">

-+           source="${ant.build.javac.source}"

-+           target="${ant.build.javac.target}">

- 

-       <classpath refid="compile.classpath"/>

-     

-@@ -373,6 +371,8 @@

-                unless="logkit.present"/>

-       

-                unless="avalon-framework.present"/>

-+      

-+               unless="servlet-api.present"/>

-     </javac>

-   </target>

- 

diff --git a/readlicense_oo/license/NOTICE b/readlicense_oo/license/NOTICE

index 46b7fccaf737..0cecc2dbfa50 100644

--- a/readlicense_oo/license/NOTICE

+++ b/readlicense_oo/license/NOTICE

@@ -25,7 +25,6 @@ Apache projects:

 - Apache Lucene

 - Apache Portable Runtime

 - Apache Portable Runtime Utility Library

-- Apache Commons - used by MediaWiki Publisher extension

 - Apache Jakarta HttpClient - used by MediaWiki Publisher extension

 - Apache Tomcat - used by MediaWiki Publisher extension

@@ -106,13 +105,6 @@ This product includes software from the Spring Framework,

 under the Apache License 2.0 (see: StringUtils.containsWhitespace())

-Apache Commons Logging

-Copyright 2003-2007 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

-

 Apache Tomcat

 Copyright 1999-2012 The Apache Software Foundation

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml

index 2c45a12fd202..2bd6b943096f 100644

--- a/readlicense_oo/license/license.xml

+++ b/readlicense_oo/license/license.xml

@@ -52,12 +52,6 @@

     
Third Party Code Additional Copyright

     Notices and License Terms

     
Libraries

-    

-        
Apache Commons

-        
The following software may be included in this product: Apache Commons (codec, httpclient, lang, logging).

-        Use of any of this software is governed by the terms of the license below:

-        
Jump to Apache License Version 2.0

-    

         
Apache Portable Runtime (APR)

         
The following software may be included in this product: Apache Portable Runtime (APR).

diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk

index 101ebc9330b7..7abcf796a0d0 100644

--- a/reportbuilder/Jar_reportbuilder.mk

+++ b/reportbuilder/Jar_reportbuilder.mk

@@ -15,7 +15,6 @@ $(eval $(call gb_Jar_use_jars,reportbuilder,\

 ))

 $(eval $(call gb_Jar_use_externals,reportbuilder,\

-	commons-logging \

 	flow-engine \

 	flute \

 	libbase \

diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java

index 463addc63e71..b3c4508666ca 100644

--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java

+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java

@@ -58,9 +58,6 @@ import java.util.Map;

 import java.util.logging.Level;

 import java.util.logging.Logger;

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-

 /**

  * Very primitive implementation, just to show how this could be used ...

@@ -142,7 +139,7 @@ public class SDBCReportDataFactory implements DataSourceFactory

         private int parameterCount = 0;

         private final ArrayList<Integer> parameterIndex = new ArrayList<Integer>();

     }

-    private static final Log LOGGER = LogFactory.getLog(SDBCReportDataFactory.class);

+    private static final Logger LOGGER = Logger.getLogger(SDBCReportDataFactory.class.getName());

     public static final String COMMAND_TYPE = "command-type";

     public static final String ESCAPE_PROCESSING = "escape-processing";

     public static final String SORT_EXPRESSIONS = "sort-expressions";

@@ -259,7 +256,7 @@ public class SDBCReportDataFactory implements DataSourceFactory

         }

         catch (SQLException ex)

         {

-            LOGGER.error("ReportProcessing failed / getOrderStatement could not get quote character", ex);

+            LOGGER.severe("ReportProcessing failed / getOrderStatement could not get quote character: " + ex);

             // fall back to the SQL standard

             quote="";

         }

diff --git a/reportbuilder/java/org/libreoffice/report/StorageRepository.java b/reportbuilder/java/org/libreoffice/report/StorageRepository.java

index 8b6d08c458a2..a338ee5dedb5 100644

--- a/reportbuilder/java/org/libreoffice/report/StorageRepository.java

+++ b/reportbuilder/java/org/libreoffice/report/StorageRepository.java

@@ -37,9 +37,7 @@ import java.io.BufferedOutputStream;

 import java.io.IOException;

 import java.io.InputStream;

 import java.io.OutputStream;

-

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

+import java.util.logging.Logger;

 /**

  * A directory holds all the contents here.

@@ -49,8 +47,8 @@ import org.apache.commons.logging.LogFactory;

 public class StorageRepository implements InputRepository, OutputRepository

 {

-    private static final Log LOGGER = LogFactory.getLog(StorageRepository.class);

-    private static final String REPORT_PROCESSING_FAILED = "ReportProcessing failed";

+    private static final Logger LOGGER = Logger.getLogger(StorageRepository.class.getName());

+    private static final String REPORT_PROCESSING_FAILED = "ReportProcessing failed: ";

     private XStorage input;

     private XStorage output;

     private final String rootURL;

@@ -134,11 +132,11 @@ public class StorageRepository implements InputRepository, OutputRepository

         }

         catch (InvalidStorageException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (com.sun.star.lang.IllegalArgumentException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (NoSuchElementException e)

         {

@@ -168,15 +166,15 @@ public class StorageRepository implements InputRepository, OutputRepository

         }

         catch (InvalidStorageException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (com.sun.star.lang.IllegalArgumentException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (NoSuchElementException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         return false;

     }

@@ -195,23 +193,23 @@ public class StorageRepository implements InputRepository, OutputRepository

         }

         catch (NoSuchElementException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (WrappedTargetException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (InvalidStorageException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (IllegalArgumentException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (com.sun.star.io.IOException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         throw new IOException();

     }

@@ -245,27 +243,27 @@ public class StorageRepository implements InputRepository, OutputRepository

         }

         catch (UnknownPropertyException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (PropertyVetoException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (IllegalArgumentException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (WrappedTargetException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (InvalidStorageException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (com.sun.star.io.IOException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         throw new IOException();

@@ -293,11 +291,11 @@ public class StorageRepository implements InputRepository, OutputRepository

             }

             catch (com.sun.star.io.IOException ex)

             {

-                LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+                LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

             }

             catch (WrappedTargetException ex)

             {

-                LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+                LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

             }

             output.dispose();

         }

@@ -312,11 +310,11 @@ public class StorageRepository implements InputRepository, OutputRepository

         }

         catch (InvalidStorageException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (com.sun.star.lang.IllegalArgumentException ex)

         {

-            LOGGER.error(REPORT_PROCESSING_FAILED, ex);

+            LOGGER.severe(REPORT_PROCESSING_FAILED + ex);

         }

         catch (NoSuchElementException ex)

         {

diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf

index 23731b104054..2a56b2fbb9fa 100644

--- a/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf

+++ b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf

@@ -3,5 +3,5 @@ Class-Path: reportbuilderwizard.jar

   flute-1.1.6.jar libserializer-1.1.6.jar libbase-1.1.6.jar

   libfonts-1.1.6.jar libformula-1.1.7.jar liblayout.jar

   libloader-1.1.6.jar librepository-1.1.6.jar libxml-1.1.7.jar

-  flow-engine.jar sac.jar commons-logging-1.2.jar

+  flow-engine.jar sac.jar

 UNO-Type-Path: 

diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java

index 480bca548e7e..efb4261ce127 100644

--- a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java

+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java

@@ -42,9 +42,7 @@ import java.io.IOException;

 import java.util.ArrayList;

 import java.util.List;

-

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

+import java.util.logging.Logger;

 import org.jfree.report.expressions.Expression;

 import org.jfree.report.expressions.FormulaExpression;

@@ -72,7 +70,7 @@ import org.pentaho.reporting.libraries.resourceloader.ResourceManager;

 public class PentahoReportJob implements ReportJob

 {

-    private static final Log LOGGER = LogFactory.getLog(PentahoReportJob.class);

+    private static final Logger LOGGER = Logger.getLogger(PentahoReportJob.class.getName());

     private final DataSourceFactory dataSourceFactory;

     private final OutputRepository outputRepository;

     private final JobProperties jobProperties;

@@ -235,7 +233,7 @@ public class PentahoReportJob implements ReportJob

                 }

                 catch (ParseException ex)

                 {

-                    LOGGER.error("ReportProcessing failed", ex);

+                    LOGGER.severe("ReportProcessing failed: " + ex);

                 }

             }

             else if (node instanceof OfficeDetailSection)

@@ -338,7 +336,7 @@ public class PentahoReportJob implements ReportJob

             rp.processReport(job);

             job.close();

             final long endTime = System.currentTimeMillis();

-            LOGGER.debug("Report processing time: " + (endTime - startTime));

+            LOGGER.config("Report processing time: " + (endTime - startTime));

         }

         catch (final Exception e)

         {

diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java

index 54694fd619ab..3c52473e3d3c 100644

--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java

+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java

@@ -68,9 +68,6 @@ import java.io.Writer;

 import java.io.PrintWriter;

 import java.io.StringWriter;