From bdb906e588e5e4c2e06d2ac5ccdd27e95b3c3391 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 24 Aug 2010 18:24:19 +0100
Subject: [PATCH] Enable parameterization for log levels in logback files to
 allow the use of command-line options for controlling log output.

---
 acl/src/test/resources/logback-test.xml              | 4 +++-
 config/src/test/resources/logback-test.xml           | 6 ++++--
 core/src/test/resources/logback-test.xml             | 4 +++-
 itest/context/src/test/resources/logback-test.xml    | 3 ++-
 itest/web/src/test/resources/logback-test.xml        | 3 ++-
 ldap/src/test/resources/logback-test.xml             | 3 ++-
 samples/aspectj/src/test/resources/logback-test.xml  | 4 +++-
 samples/contacts/src/test/resources/logback-test.xml | 4 +++-
 samples/dms/src/test/resources/logback-test.xml      | 4 +++-
 web/src/test/resources/logback-test.xml              | 4 +++-
 10 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/acl/src/test/resources/logback-test.xml b/acl/src/test/resources/logback-test.xml
index 39ba6d17e7..f293b342dc 100644
--- a/acl/src/test/resources/logback-test.xml
+++ b/acl/src/test/resources/logback-test.xml
@@ -5,7 +5,9 @@
     </encoder>
   </appender>
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
   </root>
 
diff --git a/config/src/test/resources/logback-test.xml b/config/src/test/resources/logback-test.xml
index bf58c9887e..e1bb6f4973 100644
--- a/config/src/test/resources/logback-test.xml
+++ b/config/src/test/resources/logback-test.xml
@@ -5,9 +5,11 @@
     </encoder>
   </appender>
 
-  <logger name="org.apache.directory" level="WARN"/>
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
 
-  <root level="WARN">
+  <logger name="org.apache.directory" level="ERROR"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
   </root>
 
diff --git a/core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml
index 39ba6d17e7..f293b342dc 100644
--- a/core/src/test/resources/logback-test.xml
+++ b/core/src/test/resources/logback-test.xml
@@ -5,7 +5,9 @@
     </encoder>
   </appender>
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
   </root>
 
diff --git a/itest/context/src/test/resources/logback-test.xml b/itest/context/src/test/resources/logback-test.xml
index 2a165ab3f7..9c25571377 100644
--- a/itest/context/src/test/resources/logback-test.xml
+++ b/itest/context/src/test/resources/logback-test.xml
@@ -5,9 +5,10 @@
     </encoder>
   </appender>
 
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
   <logger name="org.apache.directory" level="ERROR"/>
 
-  <root level="WARN">
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
   </root>
 
diff --git a/itest/web/src/test/resources/logback-test.xml b/itest/web/src/test/resources/logback-test.xml
index 2a165ab3f7..9c25571377 100644
--- a/itest/web/src/test/resources/logback-test.xml
+++ b/itest/web/src/test/resources/logback-test.xml
@@ -5,9 +5,10 @@
     </encoder>
   </appender>
 
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
   <logger name="org.apache.directory" level="ERROR"/>
 
-  <root level="WARN">
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
   </root>
 
diff --git a/ldap/src/test/resources/logback-test.xml b/ldap/src/test/resources/logback-test.xml
index 2a165ab3f7..9c25571377 100644
--- a/ldap/src/test/resources/logback-test.xml
+++ b/ldap/src/test/resources/logback-test.xml
@@ -5,9 +5,10 @@
     </encoder>
   </appender>
 
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
   <logger name="org.apache.directory" level="ERROR"/>
 
-  <root level="WARN">
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
   </root>
 
diff --git a/samples/aspectj/src/test/resources/logback-test.xml b/samples/aspectj/src/test/resources/logback-test.xml
index 39ba6d17e7..f293b342dc 100644
--- a/samples/aspectj/src/test/resources/logback-test.xml
+++ b/samples/aspectj/src/test/resources/logback-test.xml
@@ -5,7 +5,9 @@
     </encoder>
   </appender>
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
   </root>
 
diff --git a/samples/contacts/src/test/resources/logback-test.xml b/samples/contacts/src/test/resources/logback-test.xml
index 39ba6d17e7..f293b342dc 100644
--- a/samples/contacts/src/test/resources/logback-test.xml
+++ b/samples/contacts/src/test/resources/logback-test.xml
@@ -5,7 +5,9 @@
     </encoder>
   </appender>
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
   </root>
 
diff --git a/samples/dms/src/test/resources/logback-test.xml b/samples/dms/src/test/resources/logback-test.xml
index 39ba6d17e7..f293b342dc 100644
--- a/samples/dms/src/test/resources/logback-test.xml
+++ b/samples/dms/src/test/resources/logback-test.xml
@@ -5,7 +5,9 @@
     </encoder>
   </appender>
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
   </root>
 
diff --git a/web/src/test/resources/logback-test.xml b/web/src/test/resources/logback-test.xml
index 39ba6d17e7..f293b342dc 100644
--- a/web/src/test/resources/logback-test.xml
+++ b/web/src/test/resources/logback-test.xml
@@ -5,7 +5,9 @@
     </encoder>
   </appender>
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
   </root>