Skip to content

Commit

Permalink
Harmonize log configuration
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
snicoll committed Mar 20, 2014
1 parent 10af128 commit 4cd818b
Show file tree
Hide file tree
Showing 43 changed files with 242 additions and 608 deletions.
10 changes: 10 additions & 0 deletions spring-aop/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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

28 changes: 0 additions & 28 deletions spring-aop/src/test/resources/log4j.xml

This file was deleted.

9 changes: 9 additions & 0 deletions spring-aspects/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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
28 changes: 0 additions & 28 deletions spring-aspects/src/test/resources/log4j.xml

This file was deleted.

9 changes: 9 additions & 0 deletions spring-beans/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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

24 changes: 0 additions & 24 deletions spring-beans/src/test/resources/log4j.xml

This file was deleted.

10 changes: 10 additions & 0 deletions spring-context-support/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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
28 changes: 0 additions & 28 deletions spring-context-support/src/test/resources/log4j.xml

This file was deleted.

9 changes: 9 additions & 0 deletions spring-context/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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

24 changes: 0 additions & 24 deletions spring-context/src/test/resources/log4j.xml

This file was deleted.

11 changes: 11 additions & 0 deletions spring-core/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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

28 changes: 0 additions & 28 deletions spring-core/src/test/resources/log4j.xml

This file was deleted.

10 changes: 10 additions & 0 deletions spring-expression/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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

28 changes: 0 additions & 28 deletions spring-expression/src/test/resources/log4j.xml

This file was deleted.

10 changes: 10 additions & 0 deletions spring-instrument-tomcat/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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

28 changes: 0 additions & 28 deletions spring-instrument-tomcat/src/test/resources/log4j.xml

This file was deleted.

10 changes: 10 additions & 0 deletions spring-instrument/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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

28 changes: 0 additions & 28 deletions spring-instrument/src/test/resources/log4j.xml

This file was deleted.

10 changes: 10 additions & 0 deletions spring-jdbc/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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

28 changes: 0 additions & 28 deletions spring-jdbc/src/test/resources/log4j.xml

This file was deleted.

Loading

0 comments on commit 4cd818b

Please sign in to comment.