[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/logback.xml system/conf/global-system.xml

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 26 16:02:29 2013
New Revision: 5086

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5086&view=rev
Log:
Fix logback config location, and move over settings from testbed.

Modified:
    trunk/idp-conf/src/main/resources/conf/logback.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/logback.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/logback.xml?rev=5086&r1=5085&r2=5086&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml Thu Dec 26 16:02:29 2013
@@ -1,17 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <configuration>
 
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%level [%logger:%line] - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
+  <logger name="idp" level="DEBUG"/>
+  
+  <logger name="org.opensaml.saml.saml2.binding" level="DEBUG"/>
+  
+  <logger name="org.opensaml.saml.common.binding" level="DEBUG"/>
+  
+  <logger name="net.shibboleth.idp.profile" level="DEBUG"/>
 
-    <root>
-        <level value="warn" />
-        <appender-ref ref="STDOUT" />
-    </root>
+  <logger name="net.shibboleth.idp.authn" level="DEBUG"/>
+  
+  <logger name="net.shibboleth.idp.session" level="DEBUG"/>
+  
+  <logger name="org.springframework.web" level="WARN"/>
+  
+  <logger name="org.springframework.webflow" level="WARN"/>
+  
+  <logger name="net.shibboleth.idp" level="INFO"/>
+  
+  <logger name="org.opensaml" level="WARN"/>
+  
+  <logger name="org.opensaml.storage" level="TRACE"/>
+  
+  <logger name="org.eclipse.jetty" level="INFO"/>
+  
+  <logger name="org.ldaptive" level="INFO"/>
+
+  <logger name="PROTOCOL_MESSAGE" level="DEBUG" />
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+        <charset>UTF-8</charset>
+        <Pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} [%5level] : %logger: %msg%n</Pattern>
+    </encoder>
+  </appender>
     
+  <root level="warn">
+    <appender-ref ref="STDOUT" />
+  </root>
+  
 </configuration>

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5086&r1=5085&r2=5086&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Thu Dec 26 16:02:29 2013
@@ -30,7 +30,7 @@
     
     <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop"
           p:id="shibboleth.LogbackLogging"
-          p:loggingConfiguration="file:${idp.home}/conf/logback.xml"
+          p:loggingConfiguration="file://${idp.home}/conf/logback.xml"
           p:reloadCheckDelay="${idp.service.logging.checkInterval}"
           p:reloadTaskTimer-ref="shibboleth.TaskTimer"
           p:failFast="${idp.service.logging.failFast}"/>