From 34a80d7ca6ac26215489716b91f03c2d05849387 Mon Sep 17 00:00:00 2001
From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Wed, 29 Jul 2009 19:15:50 +0000
Subject: [PATCH] NOJIRA - added log4j logging thru slf4j.

---
 services/collectionobject/client/pom.xml      | 23 ++++----
 .../src/test/resources/log4j.properties       | 23 ++++++++
 .../client/src/test/resources/log4j.xml       | 58 -------------------
 services/intake/client/pom.xml                | 23 ++++++++
 .../src/test/resources/log4j.properties       | 23 ++++++++
 .../client/src/test/resources/log4j.xml       | 45 --------------
 6 files changed, 81 insertions(+), 114 deletions(-)
 create mode 100644 services/collectionobject/client/src/test/resources/log4j.properties
 delete mode 100644 services/collectionobject/client/src/test/resources/log4j.xml
 create mode 100644 services/intake/client/src/test/resources/log4j.properties
 delete mode 100644 services/intake/client/src/test/resources/log4j.xml

diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index 0e946af98..bb39f818a 100644
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -16,6 +16,17 @@
     <name>services.collectionobject.client</name>
     
     <dependencies>
+        <!-- keep slf4j dependencies on the top -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
@@ -32,16 +43,6 @@
             <artifactId>testng</artifactId>
             <version>5.6</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.5.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.2</version>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
@@ -81,7 +82,7 @@
                     <systemProperties>
                         <property>
                             <name>log4j.configuration</name>
-                            <value>log4j.xml</value>
+                            <value>file:target/test-classes/log4j.properties</value>
                         </property>
                     </systemProperties>
                 </configuration>
diff --git a/services/collectionobject/client/src/test/resources/log4j.properties b/services/collectionobject/client/src/test/resources/log4j.properties
new file mode 100644
index 000000000..18c510350
--- /dev/null
+++ b/services/collectionobject/client/src/test/resources/log4j.properties
@@ -0,0 +1,23 @@
+log4j.rootLogger=debug, stdout, R
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=target/test-client.log
+
+log4j.appender.R.MaxFileSize=100KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+#packages
+log4j.logger.org.collectionspace=DEBUG
+log4j.logger.org.apache=INFO
+log4j.logger.httpclient=INFO
+log4j.logger.org.jboss.resteasy=INFO
diff --git a/services/collectionobject/client/src/test/resources/log4j.xml b/services/collectionobject/client/src/test/resources/log4j.xml
deleted file mode 100644
index b26abaa9b..000000000
--- a/services/collectionobject/client/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <param name="Target" value="System.out" />
-        <layout class="org.apache.log4j.TTCCLayout">
-            <param name="DateFormat" value="ISO8601" />
-        </layout>
-    </appender>
-
-    <appender name="unit-tests"
-		class="org.apache.log4j.RollingFileAppender">
-        <param name="File" value="./target/unit-tests.log" />
-        <param name="MaxFileSize" value="10240KB" />
-        <param name="MaxBackupIndex" value="6" />
-        <layout class="org.apache.log4j.TTCCLayout">
-            <param name="DateFormat" value="ISO8601" />
-        </layout>
-    </appender>
-
-	<!--logger name="org.apache.commons.httpclient" additivity="false">
-		<level value="info" />
-		<appender-ref ref="console" />
-		<appender-ref ref="unit-tests" />
-	</logger>
-
-	<logger name="httpclient.wire" additivity="false">
-		<level value="info" />
-		<appender-ref ref="console" />
-		<appender-ref ref="unit-tests" />
-	</logger>
-
-	<logger name="org.collectionspace" additivity="false">
-		<level value="info" />
-		<appender-ref ref="console" />
-		<appender-ref ref="unit-tests" />
-	</logger-->
-    <category name="org.apache.commons.httpclient">
-        <priority value="INFO"/>
-    </category>
-    <category name="httpclient.wire">
-        <priority value="INFO"/>
-    </category>
-    <category name="org.collectionspace.services.client">
-        <priority value="DEBUG"/>
-    </category>
-    <root>
-        <priority value="debug" />
-        <appender-ref ref="console" />
-        <appender-ref ref="unit-tests" />
-    </root>
-
-</log4j:configuration>
-
-
-
-
diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
index ddbbeec36..e0f062f7c 100644
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -16,6 +16,17 @@
     <name>services.intake.client</name>
     
     <dependencies>
+        <!-- keep slf4j dependencies on the top -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.intake.jaxb</artifactId>
@@ -74,6 +85,18 @@
     <build>
         <finalName>collectionspace-services-intake-client</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>log4j.configuration</name>
+                            <value>file:target/test-classes/log4j.properties</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.0.2</version>
diff --git a/services/intake/client/src/test/resources/log4j.properties b/services/intake/client/src/test/resources/log4j.properties
new file mode 100644
index 000000000..18c510350
--- /dev/null
+++ b/services/intake/client/src/test/resources/log4j.properties
@@ -0,0 +1,23 @@
+log4j.rootLogger=debug, stdout, R
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=target/test-client.log
+
+log4j.appender.R.MaxFileSize=100KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+#packages
+log4j.logger.org.collectionspace=DEBUG
+log4j.logger.org.apache=INFO
+log4j.logger.httpclient=INFO
+log4j.logger.org.jboss.resteasy=INFO
diff --git a/services/intake/client/src/test/resources/log4j.xml b/services/intake/client/src/test/resources/log4j.xml
deleted file mode 100644
index 52121cb83..000000000
--- a/services/intake/client/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<layout class="org.apache.log4j.TTCCLayout">
-			<param name="DateFormat" value="ISO8601" />
-		</layout>
-	</appender>
-
-
-	<appender name="unit-tests"
-		class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="./target/unit-tests.log" />
-		<param name="MaxFileSize" value="10240KB" />
-		<param name="MaxBackupIndex" value="6" />
-		<layout class="org.apache.log4j.TTCCLayout">
-			<param name="DateFormat" value="ISO8601" />
-		</layout>
-	</appender>
-
-	<logger name="org.apache.commons.httpclient" additivity="false">
-		<level value="warn" />
-		<appender-ref ref="console" />
-		<appender-ref ref="unit-tests" />
-	</logger>
-
-	<logger name="httpclient.wire" additivity="false">
-		<level value="info" />
-		<appender-ref ref="console" />
-		<appender-ref ref="unit-tests" />
-	</logger>
-
-	<root>
-		<priority value="debug" />
-		<appender-ref ref="console" />
-		<appender-ref ref="unit-tests" />
-	</root>
-
-</log4j:configuration>
-
-
-
-
-- 
2.47.3