Преглед на файлове

Removing log4j.properties files and adding logback config ones.

Luke Taylor преди 15 години
родител
ревизия
c4ee46824c

+ 0 - 10
core/src/test/resources/log4j.properties

@@ -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

+ 14 - 0
core/src/test/resources/logback-test.xml

@@ -0,0 +1,14 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.apache.directory" level="WARN"/>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>

+ 2 - 2
itest/context/src/test/resources/logback-test.xml

@@ -7,8 +7,8 @@
 
   <logger name="org.apache.directory" level="WARN"/>
 
-  <root level="DEBUG">
+  <root level="INFO">
     <appender-ref ref="STDOUT" />
   </root>
 
-</configuration>
+</configuration>

+ 0 - 7
itest/misc/src/main/resources/log4j.properties

@@ -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

+ 0 - 11
itest/web/src/main/resources/log4j.properties

@@ -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

+ 0 - 18
itest/web/src/main/webapp/WEB-INF/classes/log4j.properties

@@ -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
-
-

+ 14 - 0
itest/web/src/test/resources/logback-test.xml

@@ -0,0 +1,14 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.apache.directory" level="WARN"/>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>

+ 12 - 0
samples/contacts/src/test/resources/logback-test.xml

@@ -0,0 +1,12 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>

+ 0 - 10
sandbox/heavyduty/src/main/webapp/WEB-INF/classes/log4j.properties

@@ -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

+ 0 - 18
sandbox/webflow/src/main/webapp/WEB-INF/classes/log4j.properties

@@ -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