DRYD-645: Configure log4j2 for test logging.

diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/src/test/resources/log4j.properties b/3rdparty/nuxeo/nuxeo-platform-quote/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index bcd2a4c..0000000
--- a/3rdparty/nuxeo/nuxeo-platform-quote/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-log4j.rootLogger=WARN, CONSOLE
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%C{1}] %m%n

diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml
index cbacd6c448e4b03e94f7124914499c2c8b5fce59..3fb88d9872a0974832895e9d8d16e5bdab12640f 100644 (file)
--- a/services/IntegrationTests/pom.xml
+++ b/services/IntegrationTests/pom.xml
@@ -164,8 +164,6 @@
                         <argument>-xmlReplayBaseDir</argument>
                         <argument>${basedir}/src/test/resources/test-data/xmlreplay</argument>
                     </arguments>
-                    <systemProperties>
-                    </systemProperties>
                 </configuration>
             </plugin>
 

diff --git a/services/IntegrationTests/src/test/resources/log4j.properties b/services/IntegrationTests/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/IntegrationTests/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/JaxRsServiceProvider/src/main/resources/log4j.properties b/services/JaxRsServiceProvider/src/main/resources/log4j.properties
deleted file mode 100644 (file)
index 0a4c10c..0000000
--- a/services/JaxRsServiceProvider/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-log4j.rootLogger=ERROR, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n

diff --git a/services/PerformanceTests/src/test/resources/log4j.properties b/services/PerformanceTests/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/PerformanceTests/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/account/client/src/test/resources/log4j.properties b/services/account/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 8a63f9f..0000000
--- a/services/account/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-log4j.logger.org.hibernate=INFO
-log4j.logger.org.hibernate.cfg=WARN

diff --git a/services/account/jaxb/src/test/resources/log4j.properties b/services/account/jaxb/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 53720a7..0000000
--- a/services/account/jaxb/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-log4j.logger.org.jvnet.hyperjaxb3=DEBUG
-log4j.logger.org.hibernate=WARN
\ No newline at end of file

diff --git a/services/account/pstore/src/test/resources/log4j.properties b/services/account/pstore/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 8a63f9f..0000000
--- a/services/account/pstore/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-log4j.logger.org.hibernate=INFO
-log4j.logger.org.hibernate.cfg=WARN

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

diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml
index e7872662bb49222599beeef4c0acf6d4b85cfc84..622359253cf3ae723b20849c4bd37b8eef978b08 100644 (file)
--- a/services/acquisition/client/pom.xml
+++ b/services/acquisition/client/pom.xml
@@ -71,12 +71,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>test-data.fileName</name>
-                            <value>${project.build.directory}/test-classes/test-data</value>
-                        </property>
-                    </systemProperties>
+                    <systemPropertyVariables>
+                        <test-data.fileName>${project.build.directory}/test-classes/test-data</test-data.fileName>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/services/acquisition/client/src/test/resources/log4j.properties b/services/acquisition/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/acquisition/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/acquisition/service/src/test/resources/log4j.xml b/services/acquisition/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/acquisition/service/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>
-
-
-
-

diff --git a/services/authentication/client/src/test/resources/log4j.properties b/services/authentication/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index a78d354..0000000
--- a/services/authentication/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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=WARN

diff --git a/services/authentication/service/src/test/resources/log4j.properties b/services/authentication/service/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/authentication/service/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml
index 700dded3014ea031f8d774fbf7d084d50ef18357..4cac00d99374752d6e0b8afb996cb7c12543d5d1 100644 (file)
--- a/services/authorization-mgt/client/pom.xml
+++ b/services/authorization-mgt/client/pom.xml
@@ -147,24 +147,6 @@
 
     <build>
         <finalName>cspace-services-authorization-mgt-client</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>maven.basedir</name>
-                            <value>${basedir}</value>
-                        </property>
-                        <property>
-                            <name>log4j.configuration</name>
-                            <value>file:${project.build.directory}/test-classes/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
 </project>

diff --git a/services/authorization-mgt/client/src/test/resources/log4j.properties b/services/authorization-mgt/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 8a63f9f..0000000
--- a/services/authorization-mgt/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-log4j.logger.org.hibernate=INFO
-log4j.logger.org.hibernate.cfg=WARN

diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml
index cdd1f62a0c1ac13773f96844bc79215c0964880b..0963bf1e7be6ff576387be86df2566325df8f52b 100644 (file)
--- a/services/authorization-mgt/import/pom.xml
+++ b/services/authorization-mgt/import/pom.xml
@@ -290,8 +290,6 @@
                                                <argument>-edir</argument>
                                                <argument>${basedir}/target</argument>
                                        </arguments>
-                                       <systemProperties>
-                                       </systemProperties>
                                </configuration>
                                <dependencies>
                                        <!-- <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId>

diff --git a/services/authorization-mgt/import/src/main/resources/log4j.properties b/services/authorization-mgt/import/src/main/resources/log4j.properties
deleted file mode 100644 (file)
index 1078dec..0000000
--- a/services/authorization-mgt/import/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-log4j.rootLogger=INFO, 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.commandline=org.apache.log4j.ConsoleAppender
-log4j.appender.commandline.target=System.err
-log4j.appender.commandline.layout=org.apache.log4j.PatternLayout
-log4j.appender.commandline.layout.ConversionPattern=%d %p: %m%n
-
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=target/test-client.log
-log4j.appender.R.MaxFileSize=100KB
-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.services.authorization.spring=INFO
-# log4j.logger.org.collectionspace.services.common.authorization_mgt.AuthorizationStore=TRACE
-log4j.logger.org.apache=INFO
-log4j.logger.httpclient=INFO
-log4j.logger.org.jboss.resteasy=INFO
-log4j.logger.hibernate=WARN
-log4j.logger.org.hibernate=WARN
-log4j.logger.org.hibernate.cfg=WARN
-log4j.logger.org.springframework=WARN
-log4j.logger.ch.elca.el4j.services.xmlmerge=INFO
-log4j.logger.com.sun.xml.bind.v2.runtime=DEBUG
-log4j.logger.javax.persistence.PersistenceException=ERROR
-
-#
-# REM - 3/3/2015 temp for debugging
-#
-log4j.logger.org.springframework=ERROR
-log4j.logger.net.sf.ehcache=TRACE
-
-#
-# Logging for the command line tool that generates the Service artifacts
-#
-log4j.logger.org.collectionspace=INFO, commandline
-log4j.additivity.org.collectionspace=false
-

diff --git a/services/authorization-mgt/jaxb/src/test/resources/log4j.properties b/services/authorization-mgt/jaxb/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 53720a7..0000000
--- a/services/authorization-mgt/jaxb/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-log4j.logger.org.jvnet.hyperjaxb3=DEBUG
-log4j.logger.org.hibernate=WARN
\ No newline at end of file

diff --git a/services/authorization/jaxb/src/test/resources/log4j.properties b/services/authorization/jaxb/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 53720a7..0000000
--- a/services/authorization/jaxb/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-log4j.logger.org.jvnet.hyperjaxb3=DEBUG
-log4j.logger.org.hibernate=WARN
\ No newline at end of file

diff --git a/services/authorization/service/src/test/resources/log4j.properties b/services/authorization/service/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/authorization/service/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/batch/client/src/test/resources/log4j.properties b/services/batch/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/batch/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/batch/service/src/test/resources/log4j.xml b/services/batch/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/batch/service/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>
-
-
-
-

diff --git a/services/blob/client/src/test/resources/log4j.properties b/services/blob/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index be32f18..0000000
--- a/services/blob/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-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.perf.collectionspace=TRACE
-
-log4j.logger.org.apache=INFO
-log4j.logger.httpclient=INFO
-log4j.logger.org.jboss.resteasy=INFO

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

diff --git a/services/citation/client/src/test/resources/log4j.properties b/services/citation/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/citation/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/claim/client/src/test/resources/log4j.properties b/services/claim/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/claim/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/claim/service/src/test/resources/log4j.xml b/services/claim/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/claim/service/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>
-
-
-
-

diff --git a/services/client/pom.xml b/services/client/pom.xml
index 64fea04c339b847a080c6102190c80afed689356..7b2b20eb4955aa51dd37e689e40ec190d73bc141 100644 (file)
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -27,12 +27,6 @@
 
 <!-- External dependencies -->
 
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.0.0-M1</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

diff --git a/services/client/src/test/resources/log4j.properties b/services/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index f23adc6..0000000
--- a/services/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-log4j.rootLogger=info, 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=INFO
-log4j.logger.org.apache=INFO
-log4j.logger.httpclient=INFO
-log4j.logger.org.jboss.resteasy=INFO

diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index cba18e106ca6e289d1427c1f375c7616b49a8c1f..d31cfc5987c16688907c73d811974f4e30fb4d4b 100644 (file)
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -76,12 +76,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>test-data.fileName</name>
-                            <value>${project.build.directory}/test-classes/test-data</value>
-                        </property>
-                    </systemProperties>
+                    <systemPropertyVariables>
+                        <test-data.fileName>${project.build.directory}/test-classes/test-data</test-data.fileName>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/services/collectionobject/client/src/test/resources/log4j.properties b/services/collectionobject/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/collectionobject/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/service/src/test/resources/log4j.xml b/services/collectionobject/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/collectionobject/service/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>
-
-
-
-

diff --git a/services/common-api/src/test/resources/log4j.properties b/services/common-api/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index e2db432..0000000
--- a/services/common-api/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-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.stdout.layout.ConversionPattern=%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.services.client.PoxPayloadIn=DEBUG
-log4j.logger.org.collectionspace.services.client.PoxPayloadOut=DEBUG
-
-log4j.logger.org.collectionspace=DEBUG
-log4j.logger.org.apache=INFO
-log4j.logger.httpclient=INFO
-log4j.logger.org.jboss.resteasy=INFO

diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml
index 4e1e06899ffb360b8a6a6bb687ed265a3139e2cb..61cd855172a748910deac589ec1c47ee049a5a0d 100644 (file)
--- a/services/common-test/pom.xml
+++ b/services/common-test/pom.xml
@@ -25,11 +25,6 @@
             <version>${project.version}</version>
         </dependency>
         <!-- External dependencies -->
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.0.0-M1</version>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

diff --git a/services/common-test/src/test/resources/log4j.properties b/services/common-test/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/common-test/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/common/src/test/resources/log4j.properties b/services/common/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index e2db432..0000000
--- a/services/common/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-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.stdout.layout.ConversionPattern=%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.services.client.PoxPayloadIn=DEBUG
-log4j.logger.org.collectionspace.services.client.PoxPayloadOut=DEBUG
-
-log4j.logger.org.collectionspace=DEBUG
-log4j.logger.org.apache=INFO
-log4j.logger.httpclient=INFO
-log4j.logger.org.jboss.resteasy=INFO

diff --git a/services/concept/client/src/test/resources/log4j.properties b/services/concept/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/concept/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/conditioncheck/client/src/test/resources/log4j.properties b/services/conditioncheck/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/conditioncheck/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/conditioncheck/service/src/test/resources/log4j.xml b/services/conditioncheck/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 3869b52..0000000
--- a/services/conditioncheck/service/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,41 +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>

diff --git a/services/conservation/client/src/test/resources/log4j.properties b/services/conservation/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/conservation/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/conservation/service/src/test/resources/log4j.xml b/services/conservation/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/conservation/service/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>
-
-
-
-

diff --git a/services/contact/client/src/test/resources/log4j.properties b/services/contact/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/contact/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/contact/service/src/test/resources/log4j.xml b/services/contact/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/contact/service/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>
-
-
-
-

diff --git a/services/dimension/client/src/test/resources/log4j.properties b/services/dimension/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/dimension/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/dimension/service/src/test/resources/log4j.xml b/services/dimension/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/dimension/service/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>
-
-
-
-

diff --git a/services/exhibition/client/src/test/resources/log4j.properties b/services/exhibition/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/exhibition/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/exhibition/service/src/test/resources/log4j.xml b/services/exhibition/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 3869b52..0000000
--- a/services/exhibition/service/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,41 +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>

diff --git a/services/group/client/src/test/resources/log4j.properties b/services/group/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/group/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/group/service/src/test/resources/log4j.xml b/services/group/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/group/service/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>
-
-
-
-

diff --git a/services/id/client/src/test/resources/log4j.properties b/services/id/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/id/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/id/service/src/test/resources/log4j.properties b/services/id/service/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/id/service/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/id/service/src/test/resources/log4j.xml b/services/id/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/id/service/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>
-
-
-
-

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

diff --git a/services/index/client/src/test/resources/log4j.properties b/services/index/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/index/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/index/service/src/test/resources/log4j.xml b/services/index/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/index/service/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>
-
-
-
-

diff --git a/services/intake/client/src/test/resources/log4j.properties b/services/intake/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/intake/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/service/src/test/resources/log4j.xml b/services/intake/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/intake/service/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>
-
-
-
-

diff --git a/services/loanin/client/src/test/resources/log4j.properties b/services/loanin/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/loanin/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/loanin/service/src/test/resources/log4j.xml b/services/loanin/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/loanin/service/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>
-
-
-
-

diff --git a/services/loanout/client/src/test/resources/log4j.properties b/services/loanout/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/loanout/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/loanout/service/src/test/resources/log4j.xml b/services/loanout/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/loanout/service/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>
-
-
-
-

diff --git a/services/location/client/src/test/resources/log4j.properties b/services/location/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/location/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/material/client/src/test/resources/log4j.properties b/services/material/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/material/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/media/client/src/test/resources/log4j.properties b/services/media/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 2a4e105..0000000
--- a/services/media/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-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.services.client.PoxPayloadIn=DEBUG
-log4j.logger.org.collectionspace.services.client.PoxPayloadOut=DEBUG
-
-log4j.logger.org.collectionspace=DEBUG
-log4j.logger.org.apache=INFO
-log4j.logger.httpclient=INFO
-log4j.logger.org.jboss.resteasy=INFO

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

diff --git a/services/movement/client/src/test/resources/log4j.properties b/services/movement/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/movement/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/movement/service/src/test/resources/log4j.xml b/services/movement/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/movement/service/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>
-
-
-
-

diff --git a/services/note/client/src/test/resources/log4j.properties b/services/note/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/note/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/note/service/src/test/resources/log4j.xml b/services/note/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/note/service/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>
-
-
-
-

diff --git a/services/objectexit/client/src/test/resources/log4j.properties b/services/objectexit/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/objectexit/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/objectexit/service/src/test/resources/log4j.xml b/services/objectexit/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/objectexit/service/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>
-
-
-
-

diff --git a/services/organization/client/src/test/resources/log4j.properties b/services/organization/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/organization/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/osteology/client/src/test/resources/log4j.properties b/services/osteology/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/osteology/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/osteology/service/src/test/resources/log4j.xml b/services/osteology/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 3869b52..0000000
--- a/services/osteology/service/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,41 +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>

diff --git a/services/person/client/src/test/resources/log4j.properties b/services/person/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index dbbca89..0000000
--- a/services/person/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-log4j.rootLogger=debug, stdout, R
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.encoding=UTF-8
-
-# 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.encoding=UTF-8
-
-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/place/client/src/test/resources/log4j.properties b/services/place/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/place/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/pom.xml b/services/pom.xml
index 1865c8c6b5750855f3f4e61d18304448774bdf4a..76ac6aafea0fa4a1c85fa66e218600d77d5fa4c9 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -130,16 +130,11 @@
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>3.0.0-M1</version>
                                        <configuration>
-                                               <systemProperties>
-                                                       <property>
-                                                               <name>log4j.configuration</name>
-                                                               <value>file:${project.build.directory}/test-classes/log4j.properties</value>
-                                                       </property>
-                                                       <property>
-                                                               <name>maven.basedir</name>
-                                                               <value>${basedir}</value>
-                                                       </property>
-                                               </systemProperties>
+                                               <systemPropertyVariables>
+                                                       <log4j.configurationFile>file:${maven.multiModuleProjectDirectory}/src/main/resources/log4j2-surefire.xml</log4j.configurationFile>
+                                                       <org.jboss.logging.provider>slf4j</org.jboss.logging.provider>
+                                                       <maven.basedir>${basedir}</maven.basedir>
+                                               </systemPropertyVariables>
                                        </configuration>
                                </plugin>
                                <plugin>
@@ -248,8 +243,8 @@
                                        <configuration>
                                                <systemProperties>
                                                        <systemProperty>
-                                                               <key>log4j.configuration</key>
-                                                               <value>file:${project.build.directory}/classes/log4j.properties</value>
+                                                               <key>log4j.configurationFile</key>
+                                                               <value>file:${maven.multiModuleProjectDirectory}/src/main/resources/log4j2-exec.xml</value>
                                                        </systemProperty>
                                                </systemProperties>
                                        </configuration>

diff --git a/services/pottag/client/src/test/resources/log4j.properties b/services/pottag/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/pottag/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/pottag/service/src/test/resources/log4j.xml b/services/pottag/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/pottag/service/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>
-
-
-
-

diff --git a/services/propagation/client/src/test/resources/log4j.properties b/services/propagation/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/propagation/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/propagation/service/src/test/resources/log4j.xml b/services/propagation/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/propagation/service/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>
-
-
-
-

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

diff --git a/services/relation/client/src/test/resources/log4j.properties b/services/relation/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/relation/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/relation/service/src/test/resources/log4j.xml b/services/relation/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/relation/service/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>
-
-
-
-

diff --git a/services/report/client/src/test/resources/log4j.properties b/services/report/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/report/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/security/client/src/test/resources/log4j.properties b/services/security/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/security/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/servicegroup/client/src/test/resources/log4j.properties b/services/servicegroup/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/servicegroup/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/servicegroup/service/src/test/resources/log4j.xml b/services/servicegroup/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/servicegroup/service/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>
-
-
-
-

diff --git a/services/structureddate/client/src/test/resources/log4j.properties b/services/structureddate/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/structureddate/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/structureddate/service/src/test/resources/log4j.xml b/services/structureddate/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/structureddate/service/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>
-
-
-
-

diff --git a/services/structureddate/structureddate/src/test/resources/log4j.properties b/services/structureddate/structureddate/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index d3e4810..0000000
--- a/services/structureddate/structureddate/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-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.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.commons.beanutils=WARN
\ No newline at end of file

diff --git a/services/systeminfo/client/src/test/resources/log4j.properties b/services/systeminfo/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/systeminfo/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/systeminfo/service/src/test/resources/log4j.xml b/services/systeminfo/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/systeminfo/service/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>
-
-
-
-

diff --git a/services/taxonomy/client/src/test/resources/log4j.properties b/services/taxonomy/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/taxonomy/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/uoc/client/src/test/resources/log4j.properties b/services/uoc/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/uoc/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/uoc/service/src/test/resources/log4j.xml b/services/uoc/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/uoc/service/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>
-
-
-
-

diff --git a/services/valuationcontrol/client/src/test/resources/log4j.properties b/services/valuationcontrol/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/valuationcontrol/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/valuationcontrol/service/src/test/resources/log4j.xml b/services/valuationcontrol/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 3869b52..0000000
--- a/services/valuationcontrol/service/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,41 +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>

diff --git a/services/vocabulary/client/src/test/resources/log4j.properties b/services/vocabulary/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/vocabulary/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/vocabulary/service/src/test/resources/log4j.xml b/services/vocabulary/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/vocabulary/service/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>
-
-
-
-

diff --git a/services/work/client/src/test/resources/log4j.properties b/services/work/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/work/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/workflow/client/src/test/resources/log4j.properties b/services/workflow/client/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 148a3e8..0000000
--- a/services/workflow/client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-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/workflow/service/src/test/resources/log4j.xml b/services/workflow/service/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 52121cb..0000000
--- a/services/workflow/service/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>
-
-
-
-

diff --git a/src/main/resources/log4j2-exec.xml b/src/main/resources/log4j2-exec.xml
new file mode 100644 (file)
index 0000000..8b369d9
--- /dev/null
+++ b/src/main/resources/log4j2-exec.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+       This config is used by the maven exec plugin, as configured in services/pom.xml.
+       For runtime logging config, see services/JaxRsServiceProvider/src/main/resources/log4j2.xml.
+-->
+<Configuration status="WARN">
+       <Properties>
+               <Property name="logPattern">%d %-5p [%t] [%c:%L] %m%n</Property>
+       </Properties>
+
+       <Appenders>
+               <Console name="ConsoleAppender" target="SYSTEM_OUT">
+                       <PatternLayout pattern="${logPattern}" />
+               </Console>
+
+               <File name="LogFileAppender" append="false" fileName="target/exec.log">
+                       <PatternLayout pattern="${logPattern}" />
+               </File>
+       </Appenders>
+
+       <Loggers>
+               <Root level="INFO">
+                       <AppenderRef ref="ConsoleAppender"/>
+                       <AppenderRef ref="LogFileAppender" />
+               </Root>
+       </Loggers>
+</Configuration>

diff --git a/src/main/resources/log4j2-surefire.xml b/src/main/resources/log4j2-surefire.xml
new file mode 100644 (file)
index 0000000..bf74484
--- /dev/null
+++ b/src/main/resources/log4j2-surefire.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+       This config is used by the maven surefire plugin (for tests), as configured in services/pom.xml.
+       For runtime logging config, see services/JaxRsServiceProvider/src/main/resources/log4j2.xml.
+-->
+<Configuration status="WARN">
+       <Properties>
+               <Property name="logPattern">%d %-5p [%t] [%c:%L] %m%n</Property>
+       </Properties>
+
+       <Appenders>
+               <Console name="ConsoleAppender" target="SYSTEM_OUT">
+                       <PatternLayout pattern="${logPattern}" />
+               </Console>
+
+               <File name="LogFileAppender" append="false" fileName="target/test.log">
+                       <PatternLayout pattern="${logPattern}" />
+               </File>
+       </Appenders>
+
+       <Loggers>
+               <Root level="DEBUG">
+                       <AppenderRef ref="ConsoleAppender"/>
+                       <AppenderRef ref="LogFileAppender" />
+               </Root>
+
+               <Logger name="httpclient" level="INFO" />
+               <Logger name="org.apache" level="INFO" />
+               <Logger name="org.collectionspace.services.client.PoxPayloadIn" level="DEBUG" />
+               <Logger name="org.collectionspace.services.client.PoxPayloadOut" level="DEBUG" />
+               <Logger name="org.collectionspace" level="DEBUG" />
+               <Logger name="org.jboss.resteasy" level="INFO" />
+       </Loggers>
+</Configuration>