From 12425ac107d12eb4174d0febb11c640dcabbdf57 Mon Sep 17 00:00:00 2001
From: Andreas Beeker <kiwiwings@apache.org>
Date: Mon, 16 May 2016 09:49:17 +0000
Subject: [PATCH] added commons-logging to integration test to make profiling
 easier - just match the timestamps of the log with the timestamps of the
 profiling monitor

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1744001 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                     |  9 ++++++-
 .../commons-logging.properties                |  1 +
 src/integrationtest/log4j.properties          | 25 +++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 src/integrationtest/commons-logging.properties
 create mode 100644 src/integrationtest/log4j.properties

diff --git a/build.xml b/build.xml
index 1d9b91fcd..8f4bb29ce 100644
--- a/build.xml
+++ b/build.xml
@@ -90,7 +90,10 @@ under the License.
     </condition>
     <!-- Fix for strange woodstox references in gump build -->
     <property name="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
+	<!-- need to override POILogger property before commons logging works -->
+    <property name="org.apache.commons.logging.Log" value="org.apache.commons.logging.impl.Log4JLogger"/>
 
+	
     <!-- Main: -->
     <property name="main.resource1.dir" value="src/resources/main"/>
     <property name="main.src" location="src/java"/>
@@ -282,6 +285,7 @@ under the License.
         <propertyref name="user.language"/>
         <propertyref name="user.country"/>
         <propertyref name="javax.xml.stream.XMLInputFactory"/>
+    	<propertyref name="org.apache.commons.logging.Log"/>
     </propertyset>
 
     <path id="main.classpath">
@@ -341,6 +345,7 @@ under the License.
     </path>
 
     <path id="test.integration.classpath">
+        <pathelement location="${integration.src.test}"/>
         <path refid="scratchpad.classpath"/>
         <path refid="ooxml.classpath"/>
         <pathelement location="${main.output.test.dir}"/>
@@ -1453,6 +1458,8 @@ under the License.
 
     <target name="test-integration" depends="compile-integration,-test-integration-check,jacocotask"
             unless="integration.test.notRequired" xmlns:jacoco="antlib:org.jacoco.ant">
+    	<propertyreset name="org.apache.poi.util.POILogger" value="org.apache.poi.util.CommonsLogger"/>
+    	<delete dir="build" includes="test-integration.log*"/>
         <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-integration.exec">
             <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
                    failureproperty="integration.test.failed" showoutput="true">
@@ -2205,7 +2212,7 @@ under the License.
             <local name="lastUpdated"/>
             <tstamp>
                 <format property="lastUpdated" pattern="yyyyMMddHHmmss" timezone="UTC"/>
-            </tstamp>            
+            </tstamp>
 
             <local name="metadir"/>
             <property name="metadir" location="${repo}/org/apache/poi/@{artifactId}"/>
diff --git a/src/integrationtest/commons-logging.properties b/src/integrationtest/commons-logging.properties
new file mode 100644
index 000000000..fdf106fd2
--- /dev/null
+++ b/src/integrationtest/commons-logging.properties
@@ -0,0 +1 @@
+log4j.configuration=log4j.properties
\ No newline at end of file
diff --git a/src/integrationtest/log4j.properties b/src/integrationtest/log4j.properties
new file mode 100644
index 000000000..971ba85d5
--- /dev/null
+++ b/src/integrationtest/log4j.properties
@@ -0,0 +1,25 @@
+log4j.rootLogger=info, R
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=build/test-integration.log
+
+log4j.appender.R.MaxFileSize=1000KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=5
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+log4j.logger.org.apache.poi.poifs.nio.FileBackedDataSource=ERROR
+log4j.logger.org.apache.poi.hdgf.chunks.Chunk=FATAL
+log4j.logger.org.apache.poi.hpsf.CodePageString=ERROR
+log4j.logger.org.apache.poi.hdgf.chunks.ChunkFactory=ERROR
+log4j.logger.org.apache.poi.hslf.model.textproperties.BitMaskTextProp=ERROR
+log4j.logger.org.apache.poi.util.JvmBugs=ERROR
+log4j.logger.org.apache.poi.hslf.usermodel.HSLFTextParagraph=ERROR
+log4j.logger.org.apache.poi.openxml4j.opc.ZipPackage=ERROR
+log4j.logger.org.apache.poi.POIDocument=WARN
+log4j.logger.org.apache.poi.openxml4j.opc.OPCPackage=ERROR
+log4j.logger.org.apache.poi.xssf.usermodel.XSSFWorkbook=ERROR
+log4j.logger.org.apache.poi.hslf.usermodel.HSLFGroupShape=WARN
+log4j.logger.org.apache.poi.hslf.record.Record=ERROR
\ No newline at end of file