diff --git a/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties deleted file mode 100644 index 28af98e0e9..0000000000 --- a/core/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Logging -# - -log4j.rootLogger=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%p %c{1} - %m%n - -log4j.logger.org.springframework.security=DEBUG diff --git a/core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..0bbb0e3369 --- /dev/null +++ b/core/src/test/resources/logback-test.xml @@ -0,0 +1,14 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + diff --git a/itest/context/src/test/resources/logback-test.xml b/itest/context/src/test/resources/logback-test.xml index a53fe39b00..0bbb0e3369 100644 --- a/itest/context/src/test/resources/logback-test.xml +++ b/itest/context/src/test/resources/logback-test.xml @@ -7,8 +7,8 @@ - + - \ No newline at end of file + diff --git a/itest/misc/src/main/resources/log4j.properties b/itest/misc/src/main/resources/log4j.properties deleted file mode 100644 index bf3e537e46..0000000000 --- a/itest/misc/src/main/resources/log4j.properties +++ /dev/null @@ -1,7 +0,0 @@ -log4j.rootCategory=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n - -log4j.category.org.springframework.security=DEBUG \ No newline at end of file diff --git a/itest/web/src/main/resources/log4j.properties b/itest/web/src/main/resources/log4j.properties deleted file mode 100644 index 21e283167b..0000000000 --- a/itest/web/src/main/resources/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.rootCategory=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n - -log4j.category.org.apache.jasper=INFO -log4j.category.org.apache.directory=ERROR -log4j.category.org.mortbay.log=INFO -log4j.category.httpclient.wire=INFO -log4j.category.org.springframework.security=TRACE diff --git a/itest/web/src/main/webapp/WEB-INF/classes/log4j.properties b/itest/web/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100644 index e0df932b3d..0000000000 --- a/itest/web/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Global logging configuration -log4j.rootLogger=INFO, stdout, fileout - -log4j.logger.org.springframework.security=DEBUG - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n - -# Rolling log file output... -log4j.appender.fileout=org.apache.log4j.FileAppender -log4j.appender.fileout.File=itest-web.log -log4j.appender.fileout.Append=false -log4j.appender.fileout.layout=org.apache.log4j.PatternLayout -log4j.appender.fileout.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n - - diff --git a/itest/web/src/test/resources/logback-test.xml b/itest/web/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..0bbb0e3369 --- /dev/null +++ b/itest/web/src/test/resources/logback-test.xml @@ -0,0 +1,14 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + diff --git a/samples/contacts/src/test/resources/logback-test.xml b/samples/contacts/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..ab7d5cfba0 --- /dev/null +++ b/samples/contacts/src/test/resources/logback-test.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/log4j.properties b/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100755 index 2cfa73e4bc..0000000000 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Global logging configuration -log4j.rootLogger=DEBUG, stdout - -log4j.logger.org.springframework.security=DEBUG -log4j.logger.org.apache.directory=INFO - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%L] - %m%n diff --git a/sandbox/webflow/src/main/webapp/WEB-INF/classes/log4j.properties b/sandbox/webflow/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100644 index 2837338900..0000000000 --- a/sandbox/webflow/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Global logging configuration -log4j.rootLogger=DEBUG, stdout, fileout - -log4j.logger.org.springframework.security=DEBUG, stdout, fileout - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n - -# Rolling log file output... -log4j.appender.fileout=org.apache.log4j.RollingFileAppender -log4j.appender.fileout.File=spring-security-tutorial.log -#log4j.appender.fileout.File=${webapp.root}/WEB-INF/log4j.log -log4j.appender.fileout.MaxFileSize=1024KB -log4j.appender.fileout.MaxBackupIndex=1 -log4j.appender.fileout.layout=org.apache.log4j.PatternLayout -log4j.appender.fileout.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n