forked from spring-projects/spring-framework
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
Showing
43 changed files
with
242 additions
and
608 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file was deleted.
Oops, something went wrong.
10 changes: 10 additions & 0 deletions
10
spring-context-support/src/test/resources/log4j.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file was deleted.
Oops, something went wrong.
10 changes: 10 additions & 0 deletions
10
spring-instrument-tomcat/src/test/resources/log4j.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.