NOJIRA - added log4j logging thru slf4j.

diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index 0e946af98d37c99e7bedc01d0ce2da9ec677aacc..bb39f818a0fe70e3db8f3558d5e59ec1a7471c0f 100644 (file)
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -16,6 +16,17 @@
     <name>services.collectionobject.client</name>\r
     \r
     <dependencies>\r
+        <!-- keep slf4j dependencies on the top -->\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+            <scope>test</scope>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
@@ -32,16 +43,6 @@
             <artifactId>testng</artifactId>\r
             <version>5.6</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
@@ -81,7 +82,7 @@
                     <systemProperties>\r
                         <property>\r
                             <name>log4j.configuration</name>\r
-                            <value>log4j.xml</value>\r
+                            <value>file:target/test-classes/log4j.properties</value>\r
                         </property>\r
                     </systemProperties>\r
                 </configuration>\r

diff --git a/services/collectionobject/client/src/test/resources/log4j.properties b/services/collectionobject/client/src/test/resources/log4j.properties
new file mode 100644 (file)
index 0000000..18c5103
--- /dev/null
+++ b/services/collectionobject/client/src/test/resources/log4j.properties
@@ -0,0 +1,23 @@
+log4j.rootLogger=debug, stdout, R\r
+\r
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender\r
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout\r
+\r
+# Pattern to output the caller's file name and line number.\r
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n\r
+\r
+log4j.appender.R=org.apache.log4j.RollingFileAppender\r
+log4j.appender.R.File=target/test-client.log\r
+\r
+log4j.appender.R.MaxFileSize=100KB\r
+# Keep one backup file\r
+log4j.appender.R.MaxBackupIndex=1\r
+\r
+log4j.appender.R.layout=org.apache.log4j.PatternLayout\r
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n\r
+\r
+#packages\r
+log4j.logger.org.collectionspace=DEBUG\r
+log4j.logger.org.apache=INFO\r
+log4j.logger.httpclient=INFO\r
+log4j.logger.org.jboss.resteasy=INFO\r

diff --git a/services/collectionobject/client/src/test/resources/log4j.xml b/services/collectionobject/client/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index b26abaa..0000000
--- 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 ddbbeec365d81de4833605a9ab138b646526f0e5..e0f062f7ce5b33308c20c2b1f4677a111d796579 100644 (file)
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -16,6 +16,17 @@
     <name>services.intake.client</name>\r
     \r
     <dependencies>\r
+        <!-- keep slf4j dependencies on the top -->\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+            <scope>test</scope>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
@@ -74,6 +85,18 @@
     <build>\r
         <finalName>collectionspace-services-intake-client</finalName>\r
         <plugins>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-surefire-plugin</artifactId>\r
+                <configuration>\r
+                    <systemProperties>\r
+                        <property>\r
+                            <name>log4j.configuration</name>\r
+                            <value>file:target/test-classes/log4j.properties</value>\r
+                        </property>\r
+                    </systemProperties>\r
+                </configuration>\r
+            </plugin>\r
             <plugin>\r
                 <artifactId>maven-compiler-plugin</artifactId>\r
                 <version>2.0.2</version>\r

diff --git a/services/intake/client/src/test/resources/log4j.properties b/services/intake/client/src/test/resources/log4j.properties
new file mode 100644 (file)
index 0000000..18c5103
--- /dev/null
+++ b/services/intake/client/src/test/resources/log4j.properties
@@ -0,0 +1,23 @@
+log4j.rootLogger=debug, stdout, R\r
+\r
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender\r
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout\r
+\r
+# Pattern to output the caller's file name and line number.\r
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n\r
+\r
+log4j.appender.R=org.apache.log4j.RollingFileAppender\r
+log4j.appender.R.File=target/test-client.log\r
+\r
+log4j.appender.R.MaxFileSize=100KB\r
+# Keep one backup file\r
+log4j.appender.R.MaxBackupIndex=1\r
+\r
+log4j.appender.R.layout=org.apache.log4j.PatternLayout\r
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n\r
+\r
+#packages\r
+log4j.logger.org.collectionspace=DEBUG\r
+log4j.logger.org.apache=INFO\r
+log4j.logger.httpclient=INFO\r
+log4j.logger.org.jboss.resteasy=INFO\r

diff --git a/services/intake/client/src/test/resources/log4j.xml b/services/intake/client/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- 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>
-
-
-
-