From a9a3d56920d33f06a0de81158123ba4d493304dd Mon Sep 17 00:00:00 2001 From: Ray Lee Date: Wed, 25 Sep 2019 19:40:50 -0700 Subject: [PATCH] DRYD-645: Configure log4j2 for test logging. --- .../src/test/resources/log4j.properties | 4 -- services/IntegrationTests/pom.xml | 2 - .../src/test/resources/log4j.properties | 23 ---------- .../src/main/resources/log4j.properties | 5 --- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 25 ----------- .../jaxb/src/test/resources/log4j.properties | 25 ----------- .../src/test/resources/log4j.properties | 25 ----------- .../service/src/test/resources/log4j.xml | 45 ------------------- services/acquisition/client/pom.xml | 9 ++-- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- services/authorization-mgt/client/pom.xml | 18 -------- .../src/test/resources/log4j.properties | 25 ----------- services/authorization-mgt/import/pom.xml | 2 - .../src/main/resources/log4j.properties | 45 ------------------- .../jaxb/src/test/resources/log4j.properties | 25 ----------- .../jaxb/src/test/resources/log4j.properties | 25 ----------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 25 ----------- .../blob/service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- services/client/pom.xml | 6 --- .../src/test/resources/log4j.properties | 23 ---------- services/collectionobject/client/pom.xml | 9 ++-- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 27 ----------- services/common-test/pom.xml | 5 --- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 27 ----------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 41 ----------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 41 ----------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- .../id/service/src/test/resources/log4j.xml | 45 ------------------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 26 ----------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../note/service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 41 ----------------- .../src/test/resources/log4j.properties | 25 ----------- .../src/test/resources/log4j.properties | 23 ---------- services/pom.xml | 19 +++----- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 21 --------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- .../uoc/service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 41 ----------------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- .../src/test/resources/log4j.properties | 23 ---------- .../src/test/resources/log4j.properties | 23 ---------- .../service/src/test/resources/log4j.xml | 45 ------------------- src/main/resources/log4j2-exec.xml | 27 +++++++++++ src/main/resources/log4j2-surefire.xml | 34 ++++++++++++++ 106 files changed, 74 insertions(+), 3007 deletions(-) delete mode 100644 3rdparty/nuxeo/nuxeo-platform-quote/src/test/resources/log4j.properties delete mode 100644 services/IntegrationTests/src/test/resources/log4j.properties delete mode 100644 services/JaxRsServiceProvider/src/main/resources/log4j.properties delete mode 100644 services/PerformanceTests/src/test/resources/log4j.properties delete mode 100644 services/account/client/src/test/resources/log4j.properties delete mode 100644 services/account/jaxb/src/test/resources/log4j.properties delete mode 100644 services/account/pstore/src/test/resources/log4j.properties delete mode 100644 services/account/service/src/test/resources/log4j.xml delete mode 100644 services/acquisition/client/src/test/resources/log4j.properties delete mode 100644 services/acquisition/service/src/test/resources/log4j.xml delete mode 100644 services/authentication/client/src/test/resources/log4j.properties delete mode 100644 services/authentication/service/src/test/resources/log4j.properties delete mode 100644 services/authorization-mgt/client/src/test/resources/log4j.properties delete mode 100644 services/authorization-mgt/import/src/main/resources/log4j.properties delete mode 100644 services/authorization-mgt/jaxb/src/test/resources/log4j.properties delete mode 100644 services/authorization/jaxb/src/test/resources/log4j.properties delete mode 100644 services/authorization/service/src/test/resources/log4j.properties delete mode 100644 services/batch/client/src/test/resources/log4j.properties delete mode 100644 services/batch/service/src/test/resources/log4j.xml delete mode 100644 services/blob/client/src/test/resources/log4j.properties delete mode 100644 services/blob/service/src/test/resources/log4j.xml delete mode 100644 services/citation/client/src/test/resources/log4j.properties delete mode 100644 services/claim/client/src/test/resources/log4j.properties delete mode 100644 services/claim/service/src/test/resources/log4j.xml delete mode 100644 services/client/src/test/resources/log4j.properties delete mode 100644 services/collectionobject/client/src/test/resources/log4j.properties delete mode 100644 services/collectionobject/service/src/test/resources/log4j.xml delete mode 100644 services/common-api/src/test/resources/log4j.properties delete mode 100644 services/common-test/src/test/resources/log4j.properties delete mode 100644 services/common/src/test/resources/log4j.properties delete mode 100644 services/concept/client/src/test/resources/log4j.properties delete mode 100644 services/conditioncheck/client/src/test/resources/log4j.properties delete mode 100644 services/conditioncheck/service/src/test/resources/log4j.xml delete mode 100644 services/conservation/client/src/test/resources/log4j.properties delete mode 100644 services/conservation/service/src/test/resources/log4j.xml delete mode 100644 services/contact/client/src/test/resources/log4j.properties delete mode 100644 services/contact/service/src/test/resources/log4j.xml delete mode 100644 services/dimension/client/src/test/resources/log4j.properties delete mode 100644 services/dimension/service/src/test/resources/log4j.xml delete mode 100644 services/exhibition/client/src/test/resources/log4j.properties delete mode 100644 services/exhibition/service/src/test/resources/log4j.xml delete mode 100644 services/group/client/src/test/resources/log4j.properties delete mode 100644 services/group/service/src/test/resources/log4j.xml delete mode 100644 services/id/client/src/test/resources/log4j.properties delete mode 100644 services/id/service/src/test/resources/log4j.properties delete mode 100644 services/id/service/src/test/resources/log4j.xml delete mode 100644 services/imports/service/src/test/resources/log4j.xml delete mode 100644 services/index/client/src/test/resources/log4j.properties delete mode 100644 services/index/service/src/test/resources/log4j.xml delete mode 100644 services/intake/client/src/test/resources/log4j.properties delete mode 100644 services/intake/service/src/test/resources/log4j.xml delete mode 100644 services/loanin/client/src/test/resources/log4j.properties delete mode 100644 services/loanin/service/src/test/resources/log4j.xml delete mode 100644 services/loanout/client/src/test/resources/log4j.properties delete mode 100644 services/loanout/service/src/test/resources/log4j.xml delete mode 100644 services/location/client/src/test/resources/log4j.properties delete mode 100644 services/material/client/src/test/resources/log4j.properties delete mode 100644 services/media/client/src/test/resources/log4j.properties delete mode 100644 services/media/service/src/test/resources/log4j.xml delete mode 100644 services/movement/client/src/test/resources/log4j.properties delete mode 100644 services/movement/service/src/test/resources/log4j.xml delete mode 100644 services/note/client/src/test/resources/log4j.properties delete mode 100644 services/note/service/src/test/resources/log4j.xml delete mode 100644 services/objectexit/client/src/test/resources/log4j.properties delete mode 100644 services/objectexit/service/src/test/resources/log4j.xml delete mode 100644 services/organization/client/src/test/resources/log4j.properties delete mode 100644 services/osteology/client/src/test/resources/log4j.properties delete mode 100644 services/osteology/service/src/test/resources/log4j.xml delete mode 100644 services/person/client/src/test/resources/log4j.properties delete mode 100644 services/place/client/src/test/resources/log4j.properties delete mode 100644 services/pottag/client/src/test/resources/log4j.properties delete mode 100644 services/pottag/service/src/test/resources/log4j.xml delete mode 100644 services/propagation/client/src/test/resources/log4j.properties delete mode 100644 services/propagation/service/src/test/resources/log4j.xml delete mode 100644 services/publicitem/service/src/test/resources/log4j.xml delete mode 100644 services/relation/client/src/test/resources/log4j.properties delete mode 100644 services/relation/service/src/test/resources/log4j.xml delete mode 100644 services/report/client/src/test/resources/log4j.properties delete mode 100644 services/security/client/src/test/resources/log4j.properties delete mode 100644 services/servicegroup/client/src/test/resources/log4j.properties delete mode 100644 services/servicegroup/service/src/test/resources/log4j.xml delete mode 100644 services/structureddate/client/src/test/resources/log4j.properties delete mode 100644 services/structureddate/service/src/test/resources/log4j.xml delete mode 100644 services/structureddate/structureddate/src/test/resources/log4j.properties delete mode 100644 services/systeminfo/client/src/test/resources/log4j.properties delete mode 100644 services/systeminfo/service/src/test/resources/log4j.xml delete mode 100644 services/taxonomy/client/src/test/resources/log4j.properties delete mode 100644 services/uoc/client/src/test/resources/log4j.properties delete mode 100644 services/uoc/service/src/test/resources/log4j.xml delete mode 100644 services/valuationcontrol/client/src/test/resources/log4j.properties delete mode 100644 services/valuationcontrol/service/src/test/resources/log4j.xml delete mode 100644 services/vocabulary/client/src/test/resources/log4j.properties delete mode 100644 services/vocabulary/service/src/test/resources/log4j.xml delete mode 100644 services/work/client/src/test/resources/log4j.properties delete mode 100644 services/workflow/client/src/test/resources/log4j.properties delete mode 100644 services/workflow/service/src/test/resources/log4j.xml create mode 100644 src/main/resources/log4j2-exec.xml create mode 100644 src/main/resources/log4j2-surefire.xml 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 index bcd2a4c9a..000000000 --- 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 cbacd6c44..3fb88d987 100644 --- a/services/IntegrationTests/pom.xml +++ b/services/IntegrationTests/pom.xml @@ -164,8 +164,6 @@ -xmlReplayBaseDir ${basedir}/src/test/resources/test-data/xmlreplay - - diff --git a/services/IntegrationTests/src/test/resources/log4j.properties b/services/IntegrationTests/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 0a4c10c9e..000000000 --- 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 index 148a3e865..000000000 --- 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 index 8a63f9f10..000000000 --- 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 index 53720a742..000000000 --- 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 index 8a63f9f10..000000000 --- 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 index 52121cb83..000000000 --- a/services/account/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml index e7872662b..622359253 100644 --- a/services/acquisition/client/pom.xml +++ b/services/acquisition/client/pom.xml @@ -71,12 +71,9 @@ org.apache.maven.plugins maven-surefire-plugin - - - test-data.fileName - ${project.build.directory}/test-classes/test-data - - + + ${project.build.directory}/test-classes/test-data + diff --git a/services/acquisition/client/src/test/resources/log4j.properties b/services/acquisition/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/acquisition/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/authentication/client/src/test/resources/log4j.properties b/services/authentication/client/src/test/resources/log4j.properties deleted file mode 100644 index a78d35474..000000000 --- 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 index 148a3e865..000000000 --- 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 700dded30..4cac00d99 100644 --- a/services/authorization-mgt/client/pom.xml +++ b/services/authorization-mgt/client/pom.xml @@ -147,24 +147,6 @@ cspace-services-authorization-mgt-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - maven.basedir - ${basedir} - - - log4j.configuration - file:${project.build.directory}/test-classes/log4j.properties - - - - - 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 index 8a63f9f10..000000000 --- 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 cdd1f62a0..0963bf1e7 100644 --- a/services/authorization-mgt/import/pom.xml +++ b/services/authorization-mgt/import/pom.xml @@ -290,8 +290,6 @@ -edir ${basedir}/target - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M1 - test - commons-io commons-io diff --git a/services/client/src/test/resources/log4j.properties b/services/client/src/test/resources/log4j.properties deleted file mode 100644 index f23adc610..000000000 --- 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 cba18e106..d31cfc598 100644 --- a/services/collectionobject/client/pom.xml +++ b/services/collectionobject/client/pom.xml @@ -76,12 +76,9 @@ org.apache.maven.plugins maven-surefire-plugin - - - test-data.fileName - ${project.build.directory}/test-classes/test-data - - + + ${project.build.directory}/test-classes/test-data + diff --git a/services/collectionobject/client/src/test/resources/log4j.properties b/services/collectionobject/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/collectionobject/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/common-api/src/test/resources/log4j.properties b/services/common-api/src/test/resources/log4j.properties deleted file mode 100644 index e2db432ca..000000000 --- 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 4e1e06899..61cd85517 100644 --- a/services/common-test/pom.xml +++ b/services/common-test/pom.xml @@ -25,11 +25,6 @@ ${project.version} - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M1 - commons-io commons-io diff --git a/services/common-test/src/test/resources/log4j.properties b/services/common-test/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index e2db432ca..000000000 --- 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 index 148a3e865..000000000 --- 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 index 148a3e865..000000000 --- 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 index 3869b526d..000000000 --- a/services/conditioncheck/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/conservation/client/src/test/resources/log4j.properties b/services/conservation/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/conservation/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/contact/client/src/test/resources/log4j.properties b/services/contact/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/contact/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/dimension/client/src/test/resources/log4j.properties b/services/dimension/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/dimension/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/exhibition/client/src/test/resources/log4j.properties b/services/exhibition/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 3869b526d..000000000 --- a/services/exhibition/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/group/client/src/test/resources/log4j.properties b/services/group/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/group/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/id/client/src/test/resources/log4j.properties b/services/id/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/id/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/imports/service/src/test/resources/log4j.xml b/services/imports/service/src/test/resources/log4j.xml deleted file mode 100644 index 52121cb83..000000000 --- a/services/imports/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/index/client/src/test/resources/log4j.properties b/services/index/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/index/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/intake/client/src/test/resources/log4j.properties b/services/intake/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/intake/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/loanin/client/src/test/resources/log4j.properties b/services/loanin/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/loanin/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/loanout/client/src/test/resources/log4j.properties b/services/loanout/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/loanout/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/location/client/src/test/resources/log4j.properties b/services/location/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 148a3e865..000000000 --- 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 index 2a4e1058a..000000000 --- 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 index 52121cb83..000000000 --- a/services/media/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/movement/client/src/test/resources/log4j.properties b/services/movement/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/movement/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/note/client/src/test/resources/log4j.properties b/services/note/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/note/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/objectexit/client/src/test/resources/log4j.properties b/services/objectexit/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/objectexit/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/organization/client/src/test/resources/log4j.properties b/services/organization/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 148a3e865..000000000 --- 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 index 3869b526d..000000000 --- a/services/osteology/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/person/client/src/test/resources/log4j.properties b/services/person/client/src/test/resources/log4j.properties deleted file mode 100644 index dbbca89e7..000000000 --- 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 index 148a3e865..000000000 --- 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 1865c8c6b..76ac6aafe 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -130,16 +130,11 @@ maven-surefire-plugin 3.0.0-M1 - - - log4j.configuration - file:${project.build.directory}/test-classes/log4j.properties - - - maven.basedir - ${basedir} - - + + file:${maven.multiModuleProjectDirectory}/src/main/resources/log4j2-surefire.xml + slf4j + ${basedir} + @@ -248,8 +243,8 @@ - log4j.configuration - file:${project.build.directory}/classes/log4j.properties + log4j.configurationFile + file:${maven.multiModuleProjectDirectory}/src/main/resources/log4j2-exec.xml diff --git a/services/pottag/client/src/test/resources/log4j.properties b/services/pottag/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/pottag/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/propagation/client/src/test/resources/log4j.properties b/services/propagation/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/propagation/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/publicitem/service/src/test/resources/log4j.xml b/services/publicitem/service/src/test/resources/log4j.xml deleted file mode 100644 index 52121cb83..000000000 --- a/services/publicitem/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/relation/client/src/test/resources/log4j.properties b/services/relation/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/relation/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/report/client/src/test/resources/log4j.properties b/services/report/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 148a3e865..000000000 --- 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 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/servicegroup/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/structureddate/client/src/test/resources/log4j.properties b/services/structureddate/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/structureddate/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/structureddate/structureddate/src/test/resources/log4j.properties b/services/structureddate/structureddate/src/test/resources/log4j.properties deleted file mode 100644 index d3e4810ae..000000000 --- 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 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/systeminfo/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/taxonomy/client/src/test/resources/log4j.properties b/services/taxonomy/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/uoc/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/valuationcontrol/client/src/test/resources/log4j.properties b/services/valuationcontrol/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 3869b526d..000000000 --- a/services/valuationcontrol/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/vocabulary/client/src/test/resources/log4j.properties b/services/vocabulary/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/vocabulary/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/work/client/src/test/resources/log4j.properties b/services/work/client/src/test/resources/log4j.properties deleted file mode 100644 index 148a3e865..000000000 --- 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 index 148a3e865..000000000 --- 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 index 52121cb83..000000000 --- a/services/workflow/service/src/test/resources/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/log4j2-exec.xml b/src/main/resources/log4j2-exec.xml new file mode 100644 index 000000000..8b369d91c --- /dev/null +++ b/src/main/resources/log4j2-exec.xml @@ -0,0 +1,27 @@ + + + + + %d %-5p [%t] [%c:%L] %m%n + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/log4j2-surefire.xml b/src/main/resources/log4j2-surefire.xml new file mode 100644 index 000000000..bf74484d1 --- /dev/null +++ b/src/main/resources/log4j2-surefire.xml @@ -0,0 +1,34 @@ + + + + + %d %-5p [%t] [%c:%L] %m%n + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.47.3