diff --git a/deegree-core/deegree-core-test-logging/pom.xml b/deegree-core/deegree-core-test-logging/pom.xml index bcad2e4d17d..7f8c42a95a1 100644 --- a/deegree-core/deegree-core-test-logging/pom.xml +++ b/deegree-core/deegree-core-test-logging/pom.xml @@ -17,8 +17,8 @@ - org.apache.logging.log4j - log4j-slf4j2-impl + ch.qos.logback + logback-classic diff --git a/deegree-core/deegree-core-test-logging/src/main/resources/log4j2.properties b/deegree-core/deegree-core-test-logging/src/main/resources/log4j2.properties deleted file mode 100644 index c061fccc305..00000000000 --- a/deegree-core/deegree-core-test-logging/src/main/resources/log4j2.properties +++ /dev/null @@ -1,13 +0,0 @@ -status = error -name = deegreeTestLogConfig - -appenders = console - -appender.console.type = Console -appender.console.name = STDOUT -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d %p %C{1.} [%t] %m%n - -rootLogger.level = warn -rootLogger.appenderRefs = stdout -rootLogger.appenderRef.stdout.ref = STDOUT diff --git a/deegree-core/deegree-core-test-logging/src/main/resources/logback-test.xml b/deegree-core/deegree-core-test-logging/src/main/resources/logback-test.xml new file mode 100644 index 00000000000..1c29f479bb3 --- /dev/null +++ b/deegree-core/deegree-core-test-logging/src/main/resources/logback-test.xml @@ -0,0 +1,16 @@ + + + + %date %level %logger{1} [%thread] %msg%n + + + + + + + + + + \ No newline at end of file diff --git a/deegree-services/deegree-webservices/pom.xml b/deegree-services/deegree-webservices/pom.xml index 5d2f26a7905..177308656fe 100644 --- a/deegree-services/deegree-webservices/pom.xml +++ b/deegree-services/deegree-webservices/pom.xml @@ -37,30 +37,6 @@ - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - generate-sources - - copy-resources - - - ${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/classes - - - src/main/resources - - **/log4j2.properties - - - - - - - org.eclipse.jetty jetty-maven-plugin diff --git a/deegree-services/deegree-webservices/src/main/resources/logback.xml b/deegree-services/deegree-webservices/src/main/webapp/WEB-INF/classes/logback.xml similarity index 100% rename from deegree-services/deegree-webservices/src/main/resources/logback.xml rename to deegree-services/deegree-webservices/src/main/webapp/WEB-INF/classes/logback.xml