diff --git a/spring-aop/src/test/resources/log4j.properties b/spring-aop/src/test/resources/log4j.properties new file mode 100644 index 0000000000..d822d6b1e8 --- /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 767b96d620..0000000000 --- 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 0000000000..f400f08f05 --- /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 767b96d620..0000000000 --- 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 0000000000..c4b279dca3 --- /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 6f012e9924..0000000000 --- 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 0000000000..3195815d7d --- /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 767b96d620..0000000000 --- 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 0000000000..8d5d6be32f --- /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 49f5e2dd41..0000000000 --- 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 0000000000..e9825a9de9 --- /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 c120c05811..0000000000 --- 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 0000000000..2997213eb5 --- /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 767b96d620..0000000000 --- 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 0000000000..490efb0e00 --- /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 767b96d620..0000000000 --- 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 0000000000..b09656a10f --- /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 767b96d620..0000000000 --- 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 0000000000..2cfb3bbec9 --- /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 767b96d620..0000000000 --- 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 0000000000..0c847ca90d --- /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 767b96d620..0000000000 --- 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 0000000000..d7329a67d1 --- /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 fccd2473ad..0000000000 --- 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 0000000000..9b7421a223 --- /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 0000000000..e9bf33ac0b --- /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 e7c8f4d9dd..0000000000 --- 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 5645c16575..0722759dd9 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 0000000000..5947420f13 --- /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 4375dccede..0000000000 --- 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 0000000000..2e0e4bdaaf --- /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 e684ff2b7e..0000000000 --- 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 0000000000..d2fa686485 --- /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 767b96d620..0000000000 --- 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 0000000000..0be56f7376 --- /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 767b96d620..0000000000 --- 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 17a835faff..52cfee361d 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 0000000000..14b26693fa --- /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 785c094dde..0000000000 --- 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 0000000000..9c7f979280 --- /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 e72ac622e9..0000000000 --- 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 0000000000..69aef5372e --- /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 f8aeb053a5..0000000000 --- a/src/test/resources/log4j.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -