Move logging elements that user may need to change up to the top

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2575 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/resources/conf/logging.xml b/resources/conf/logging.xml
index d4b5389..f040431 100644 (file)
--- a/resources/conf/logging.xml
+++ b/resources/conf/logging.xml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration>
+    
+    <!--
+        Loggers define indicate which packages/categories are logged, at which level, and to which appender.
+        Levels: ALL, ERROR, WARN, INFO, DEBUG, OFF
+    -->
+    <!-- Logs IdP, but not OpenSAML, messages -->
+    <logger name="edu.internet2.middleware.shibboleth">
+        <level value="INFO" />
+        <!-- Appender, IDP_PROCESS, is inherited from the root logger -->
+    </logger>
+
+    <!-- Logs OpenSAML, but not IdP, messages -->
+    <logger name="org.opensaml">
+        <level value="WARN" />
+        <!-- Appender, IDP_PROCESS, is inherited from the root logger -->
+    </logger>
+    
+
+    <!-- 
+        Normally you should not edit below this point.  These default configurations are sufficient for 
+        almost every system.
+    -->
 
     <!-- 
         Logging appenders define where and how logging messages are logged.
@@ -44,12 +66,7 @@
 
         <layout class="ch.qos.logback.classic.PatternLayout">
             <!-- General logging pattern -->
-            <Pattern>%date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n</Pattern>
-            
-            <!-- Debug logging pattern -->
-            <!--
             <Pattern>%date{HH:mm:ss.SSS} %level [%logger:%line] - %msg%n%ex{full}%n</Pattern>
-            -->
         </layout>
     </appender>
 
@@ -58,29 +75,8 @@
         <layout class="ch.qos.logback.classic.PatternLayout">
             <Pattern>%date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n</Pattern>
         </layout>
-    </appender>
-    
-    <!--
-        Loggers define inidicate which packages/categories are logged, at which level, and to which appender.
-        Levels: ALL, ERROR, WARN, INFO, DEBUG, OFF
-    -->
-
-    <!-- Logs IdP, but not OpenSAML, messages -->
-    <logger name="edu.internet2.middleware.shibboleth">
-        <level value="INFO" />
-        <!-- Appender, IDP_PROCESS, is inherited from the root logger -->
-    </logger>
-
-    <!-- Logs OpenSAML, but not IdP, messages -->
-    <logger name="org.opensaml">
-        <level value="OFF" />
-        <!-- Appender, IDP_PROCESS, is inherited from the root logger -->
-    </logger>
-    
-    
-    
-
-    <!-- Do no edit the loggers below here. -->    
+    </appender>   
+  
     <logger name="Shibboleth-Access">
         <level value="ALL" />
         <appender-ref ref="IDP_ACCESS" />