From 4cd818b9e45298237950e2e108e4629539cbcc4a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 20 Jan 2014 10:23:13 +0100 Subject: [PATCH] Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties variant were taking the xml variant configuration from another module. The general structure of the configuration has also been harmonized to provide a standard console output as well as an easy way to enable trace logs for the current module. --- .../src/test/resources/log4j.properties | 10 +++ spring-aop/src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 9 +++ spring-aspects/src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 9 +++ spring-beans/src/test/resources/log4j.xml | 24 ------- .../src/test/resources/log4j.properties | 10 +++ .../src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 9 +++ spring-context/src/test/resources/log4j.xml | 24 ------- .../src/test/resources/log4j.properties | 11 ++++ spring-core/src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 10 +++ .../src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 10 +++ .../src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 10 +++ .../src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 10 +++ spring-jdbc/src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 11 ++++ spring-jms/src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 13 ++++ spring-messaging/src/test/resources/log4j.xml | 37 ----------- .../src/test/resources/log4j.properties | 10 +++ .../src/test/resources/log4j.properties | 10 +++ spring-orm/src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 12 ++-- .../src/test/resources/log4j.properties | 24 +++++++ spring-test/src/test/resources/log4j.xml | 63 ------------------- spring-tx/src/test/resources/log4j.properties | 10 +++ spring-tx/src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 12 ++++ spring-web/src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 10 +++ .../src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 11 ++-- .../src/test/resources/log4j.properties | 10 +++ spring-webmvc/src/test/resources/log4j.xml | 28 --------- .../src/test/resources/log4j.properties | 10 +++ spring-websocket/src/test/resources/log4j.xml | 26 -------- src/test/resources/log4j.properties | 11 ++++ src/test/resources/log4j.xml | 32 ---------- 43 files changed, 242 insertions(+), 608 deletions(-) create mode 100644 spring-aop/src/test/resources/log4j.properties delete mode 100644 spring-aop/src/test/resources/log4j.xml create mode 100644 spring-aspects/src/test/resources/log4j.properties delete mode 100644 spring-aspects/src/test/resources/log4j.xml create mode 100644 spring-beans/src/test/resources/log4j.properties delete mode 100644 spring-beans/src/test/resources/log4j.xml create mode 100644 spring-context-support/src/test/resources/log4j.properties delete mode 100644 spring-context-support/src/test/resources/log4j.xml create mode 100644 spring-context/src/test/resources/log4j.properties delete mode 100644 spring-context/src/test/resources/log4j.xml create mode 100644 spring-core/src/test/resources/log4j.properties delete mode 100644 spring-core/src/test/resources/log4j.xml create mode 100644 spring-expression/src/test/resources/log4j.properties delete mode 100644 spring-expression/src/test/resources/log4j.xml create mode 100644 spring-instrument-tomcat/src/test/resources/log4j.properties delete mode 100644 spring-instrument-tomcat/src/test/resources/log4j.xml create mode 100644 spring-instrument/src/test/resources/log4j.properties delete mode 100644 spring-instrument/src/test/resources/log4j.xml create mode 100644 spring-jdbc/src/test/resources/log4j.properties delete mode 100644 spring-jdbc/src/test/resources/log4j.xml create mode 100644 spring-jms/src/test/resources/log4j.properties delete mode 100644 spring-jms/src/test/resources/log4j.xml create mode 100644 spring-messaging/src/test/resources/log4j.properties delete mode 100644 spring-messaging/src/test/resources/log4j.xml create mode 100644 spring-orm-hibernate4/src/test/resources/log4j.properties create mode 100644 spring-orm/src/test/resources/log4j.properties delete mode 100644 spring-orm/src/test/resources/log4j.xml create mode 100644 spring-test/src/test/resources/log4j.properties delete mode 100644 spring-test/src/test/resources/log4j.xml create mode 100644 spring-tx/src/test/resources/log4j.properties delete mode 100644 spring-tx/src/test/resources/log4j.xml create mode 100644 spring-web/src/test/resources/log4j.properties delete mode 100644 spring-web/src/test/resources/log4j.xml create mode 100644 spring-webmvc-portlet/src/test/resources/log4j.properties delete mode 100644 spring-webmvc-portlet/src/test/resources/log4j.xml create mode 100644 spring-webmvc/src/test/resources/log4j.properties delete mode 100644 spring-webmvc/src/test/resources/log4j.xml create mode 100644 spring-websocket/src/test/resources/log4j.properties delete mode 100644 spring-websocket/src/test/resources/log4j.xml create mode 100644 src/test/resources/log4j.properties delete mode 100644 src/test/resources/log4j.xml diff --git a/spring-aop/src/test/resources/log4j.properties b/spring-aop/src/test/resources/log4j.properties new file mode 100644 index 00000000000..d822d6b1e8f --- /dev/null +++ b/spring-aop/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework.aop=TRACE + diff --git a/spring-aop/src/test/resources/log4j.xml b/spring-aop/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/spring-aop/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-aspects/src/test/resources/log4j.properties b/spring-aspects/src/test/resources/log4j.properties new file mode 100644 index 00000000000..f400f08f05b --- /dev/null +++ b/spring-aspects/src/test/resources/log4j.properties @@ -0,0 +1,9 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework=TRACE diff --git a/spring-aspects/src/test/resources/log4j.xml b/spring-aspects/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/spring-aspects/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-beans/src/test/resources/log4j.properties b/spring-beans/src/test/resources/log4j.properties new file mode 100644 index 00000000000..c4b279dca37 --- /dev/null +++ b/spring-beans/src/test/resources/log4j.properties @@ -0,0 +1,9 @@ +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} [%c] - %m%n + +log4j.rootCategory=ERROR, console +log4j.logger.org.springframework.beans.factory.config.DeprecatedBeanWarnerTests$MyDeprecatedBeanWarner=WARN + +#log4j.logger.org.springframework.beans=TRACE + diff --git a/spring-beans/src/test/resources/log4j.xml b/spring-beans/src/test/resources/log4j.xml deleted file mode 100644 index 6f012e99240..00000000000 --- a/spring-beans/src/test/resources/log4j.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-context-support/src/test/resources/log4j.properties b/spring-context-support/src/test/resources/log4j.properties new file mode 100644 index 00000000000..3195815d7d7 --- /dev/null +++ b/spring-context-support/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework.cache=TRACE +#log4j.logger.org.springframework.mail=TRACE diff --git a/spring-context-support/src/test/resources/log4j.xml b/spring-context-support/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/spring-context-support/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-context/src/test/resources/log4j.properties b/spring-context/src/test/resources/log4j.properties new file mode 100644 index 00000000000..8d5d6be32f7 --- /dev/null +++ b/spring-context/src/test/resources/log4j.properties @@ -0,0 +1,9 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.core=INFO + +#log4j.logger.org.springframework=TRACE + diff --git a/spring-context/src/test/resources/log4j.xml b/spring-context/src/test/resources/log4j.xml deleted file mode 100644 index 49f5e2dd41c..00000000000 --- a/spring-context/src/test/resources/log4j.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-core/src/test/resources/log4j.properties b/spring-core/src/test/resources/log4j.properties new file mode 100644 index 00000000000..e9825a9de9f --- /dev/null +++ b/spring-core/src/test/resources/log4j.properties @@ -0,0 +1,11 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.core.convert=WARN +log4j.logger.org.springframework.core.GenericTypeResolver=WARN + +#log4j.logger.org.springframework.core=TRACE +#log4j.logger.org.springframework.util=TRACE + diff --git a/spring-core/src/test/resources/log4j.xml b/spring-core/src/test/resources/log4j.xml deleted file mode 100644 index c120c05811a..00000000000 --- a/spring-core/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-expression/src/test/resources/log4j.properties b/spring-expression/src/test/resources/log4j.properties new file mode 100644 index 00000000000..2997213eb5e --- /dev/null +++ b/spring-expression/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework.expression=TRACE + diff --git a/spring-expression/src/test/resources/log4j.xml b/spring-expression/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/spring-expression/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-instrument-tomcat/src/test/resources/log4j.properties b/spring-instrument-tomcat/src/test/resources/log4j.properties new file mode 100644 index 00000000000..490efb0e009 --- /dev/null +++ b/spring-instrument-tomcat/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework.instrument.classloading=TRACE + diff --git a/spring-instrument-tomcat/src/test/resources/log4j.xml b/spring-instrument-tomcat/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/spring-instrument-tomcat/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-instrument/src/test/resources/log4j.properties b/spring-instrument/src/test/resources/log4j.properties new file mode 100644 index 00000000000..b09656a10fa --- /dev/null +++ b/spring-instrument/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework.instrument=TRACE + diff --git a/spring-instrument/src/test/resources/log4j.xml b/spring-instrument/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/spring-instrument/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-jdbc/src/test/resources/log4j.properties b/spring-jdbc/src/test/resources/log4j.properties new file mode 100644 index 00000000000..2cfb3bbec93 --- /dev/null +++ b/spring-jdbc/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework.jdbc=TRACE + diff --git a/spring-jdbc/src/test/resources/log4j.xml b/spring-jdbc/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/spring-jdbc/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-jms/src/test/resources/log4j.properties b/spring-jms/src/test/resources/log4j.properties new file mode 100644 index 00000000000..0c847ca90d0 --- /dev/null +++ b/spring-jms/src/test/resources/log4j.properties @@ -0,0 +1,11 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + + +#log4j.logger.org.springframework.jms=TRACE + diff --git a/spring-jms/src/test/resources/log4j.xml b/spring-jms/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/spring-jms/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-messaging/src/test/resources/log4j.properties b/spring-messaging/src/test/resources/log4j.properties new file mode 100644 index 00000000000..d7329a67d12 --- /dev/null +++ b/spring-messaging/src/test/resources/log4j.properties @@ -0,0 +1,13 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.messaging=DEBUG +log4j.logger.org.springframework.web=DEBUG +log4j.logger.org.apache.activemq=INFO +# Enable TRACE level to chase integration test issues on CI servers +log4j.logger.org.springframework.messaging.simp.stomp=TRACE + +#log4j.logger.org.springframework.messaging=TRACE + diff --git a/spring-messaging/src/test/resources/log4j.xml b/spring-messaging/src/test/resources/log4j.xml deleted file mode 100644 index fccd2473ad2..00000000000 --- a/spring-messaging/src/test/resources/log4j.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-orm-hibernate4/src/test/resources/log4j.properties b/spring-orm-hibernate4/src/test/resources/log4j.properties new file mode 100644 index 00000000000..9b7421a2230 --- /dev/null +++ b/spring-orm-hibernate4/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework.orm.hibernate4=TRACE + diff --git a/spring-orm/src/test/resources/log4j.properties b/spring-orm/src/test/resources/log4j.properties new file mode 100644 index 00000000000..e9bf33ac0b7 --- /dev/null +++ b/spring-orm/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=INFO, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework.orm=TRACE + diff --git a/spring-orm/src/test/resources/log4j.xml b/spring-orm/src/test/resources/log4j.xml deleted file mode 100644 index e7c8f4d9dd9..00000000000 --- a/spring-orm/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-oxm/src/test/resources/log4j.properties b/spring-oxm/src/test/resources/log4j.properties index 5645c16575a..0722759dd9f 100644 --- a/spring-oxm/src/test/resources/log4j.properties +++ b/spring-oxm/src/test/resources/log4j.properties @@ -1,6 +1,8 @@ -log4j.rootCategory=INFO, stdout -log4j.logger.org.springframework.oxm=DEBUG +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} [%c] - %m%n + +log4j.rootCategory=INFO, console + +#log4j.logger.org.springframework.oxm=TRACE -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 \ No newline at end of file diff --git a/spring-test/src/test/resources/log4j.properties b/spring-test/src/test/resources/log4j.properties new file mode 100644 index 00000000000..5947420f135 --- /dev/null +++ b/spring-test/src/test/resources/log4j.properties @@ -0,0 +1,24 @@ +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} [%c] - %m%n + +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.file=build/spring-test.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n + +log4j.rootCategory=ERROR, console, file + +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.test.context.TestContext=WARN +log4j.logger.org.springframework.test.context.ContextLoaderUtils=WARN +log4j.logger.org.springframework.test.context.transaction.TransactionalTestExecutionListener=WARN +log4j.logger.org.springframework.test.context.web=WARN +log4j.logger.org.springframework.test.context=WARN + +#log4j.logger.org.springframework.test.context.support.DelegatingSmartContextLoader=INFO +#log4j.logger.org.springframework.test.context.support.AbstractGenericContextLoader=INFO +#log4j.logger.org.springframework.test.context.support.AnnotationConfigContextLoader=INFO + +#log4j.logger.org.springframework.test=TRACE + diff --git a/spring-test/src/test/resources/log4j.xml b/spring-test/src/test/resources/log4j.xml deleted file mode 100644 index 4375dccede2..00000000000 --- a/spring-test/src/test/resources/log4j.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-tx/src/test/resources/log4j.properties b/spring-tx/src/test/resources/log4j.properties new file mode 100644 index 00000000000..2e0e4bdaafe --- /dev/null +++ b/spring-tx/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.transaction=INFO + +#log4j.logger.org.springframework.transaction=TRACE + diff --git a/spring-tx/src/test/resources/log4j.xml b/spring-tx/src/test/resources/log4j.xml deleted file mode 100644 index e684ff2b7e9..00000000000 --- a/spring-tx/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-web/src/test/resources/log4j.properties b/spring-web/src/test/resources/log4j.properties new file mode 100644 index 00000000000..d2fa6864853 --- /dev/null +++ b/spring-web/src/test/resources/log4j.properties @@ -0,0 +1,12 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework.http=TRACE +#log4j.logger.org.springframework.remoting=TRACE +#log4j.logger.org.springframework.web=TRACE + diff --git a/spring-web/src/test/resources/log4j.xml b/spring-web/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/spring-web/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webmvc-portlet/src/test/resources/log4j.properties b/spring-webmvc-portlet/src/test/resources/log4j.properties new file mode 100644 index 00000000000..0be56f73767 --- /dev/null +++ b/spring-webmvc-portlet/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG + +#log4j.logger.org.springframework.web.portlet=TRACE + diff --git a/spring-webmvc-portlet/src/test/resources/log4j.xml b/spring-webmvc-portlet/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/spring-webmvc-portlet/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webmvc-tiles3/src/test/resources/log4j.properties b/spring-webmvc-tiles3/src/test/resources/log4j.properties index 17a835fafff..52cfee361d2 100644 --- a/spring-webmvc-tiles3/src/test/resources/log4j.properties +++ b/spring-webmvc-tiles3/src/test/resources/log4j.properties @@ -1,7 +1,8 @@ -log4j.rootCategory=INFO, stdout +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} [%c] - %m%n -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.rootCategory=INFO, console +log4j.logger.org.springframework.web=DEBUG -log4j.category.org.springframework.web=DEBUG +#log4j.logger.org.springframework.web.servlet.view.tiles3=TRACE \ No newline at end of file diff --git a/spring-webmvc/src/test/resources/log4j.properties b/spring-webmvc/src/test/resources/log4j.properties new file mode 100644 index 00000000000..14b26693fa6 --- /dev/null +++ b/spring-webmvc/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.convert=DEBUG + +#log4j.logger.org.springframework.web.servlet=TRACE + diff --git a/spring-webmvc/src/test/resources/log4j.xml b/spring-webmvc/src/test/resources/log4j.xml deleted file mode 100644 index 785c094dde1..00000000000 --- a/spring-webmvc/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-websocket/src/test/resources/log4j.properties b/spring-websocket/src/test/resources/log4j.properties new file mode 100644 index 00000000000..9c7f9792801 --- /dev/null +++ b/spring-websocket/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.web=DEBUG +log4j.logger.org.springframework.web.socket=DEBUG + +#log4j.logger.org.springframework.web.socket=TRACE + diff --git a/spring-websocket/src/test/resources/log4j.xml b/spring-websocket/src/test/resources/log4j.xml deleted file mode 100644 index e72ac622e98..00000000000 --- a/spring-websocket/src/test/resources/log4j.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties new file mode 100644 index 00000000000..69aef5372e3 --- /dev/null +++ b/src/test/resources/log4j.properties @@ -0,0 +1,11 @@ +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} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springframework.binding=DEBUG +log4j.logger.org.springframework.beans.factory.xml.XmlBeanFactory=ERROR + +#log4j.logger.org.springframework=TRACE + diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml deleted file mode 100644 index f8aeb053a52..00000000000 --- a/src/test/resources/log4j.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -