refine logging

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

diff --git a/src/edu/internet2/middleware/shibboleth/serviceprovider/ContextListener.java b/src/edu/internet2/middleware/shibboleth/serviceprovider/ContextListener.java
index 6034eab..1ed81b8 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/serviceprovider/ContextListener.java
+++ b/src/edu/internet2/middleware/shibboleth/serviceprovider/ContextListener.java
@@ -47,9 +47,11 @@ import edu.internet2.middleware.commons.log4j.ThreadLocalAppender;
  * that you can move logic around as needed.
  */
 public class ContextListener implements ServletContextListener {
-       
-
-       // Initialization, parsing files, and setting up
+    
+    //TODO: Change before release
+       private static final Level defaultLogLevel = Level.DEBUG;
+    
+    // Initialization, parsing files, and setting up
        public static final String SHIBBOLETH_INIT = "shibboleth.init";
        private static  Logger initLogger = Logger.getLogger(SHIBBOLETH_INIT);
        private static  Logger initLogger2 = Logger.getLogger("edu.internet2.middleware.shibboleth.xml");
@@ -82,12 +84,12 @@ public class ContextListener implements ServletContextListener {
                
                clientLogger.addAppender(threadAppender);
                clientLogger.addAppender(consoleAppender);
-               clientLogger.setLevel(Level.DEBUG);
+               clientLogger.setLevel(defaultLogLevel);
                
                initLogger.addAppender(consoleAppender);
-               initLogger.setLevel(Level.DEBUG);
+               initLogger.setLevel(defaultLogLevel);
                
-               initLogger2.setLevel(Level.DEBUG);
+               initLogger2.setLevel(defaultLogLevel);
                
                // The init log location is represented as a URL in the web.xml
                // We have to change this int a fully qualified path name
@@ -110,10 +112,10 @@ public class ContextListener implements ServletContextListener {
                
                samlLogger.addAppender(threadAppender);
                samlLogger.addAppender(consoleAppender);
-               samlLogger.setLevel(Level.DEBUG);
+               samlLogger.setLevel(defaultLogLevel);
 
                serviceLogger.addAppender(consoleAppender);
-               serviceLogger.setLevel(Level.DEBUG);
+               serviceLogger.setLevel(defaultLogLevel);
                
                
                try {

diff --git a/src/edu/internet2/middleware/shibboleth/xml/Parser.java b/src/edu/internet2/middleware/shibboleth/xml/Parser.java
index c437a64..7c3917c 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/xml/Parser.java
+++ b/src/edu/internet2/middleware/shibboleth/xml/Parser.java
@@ -72,6 +72,10 @@ import edu.internet2.middleware.shibboleth.common.ShibResource;
  * @author Howard Gilbert
  */
 public class Parser {
+    
+    // This class is used by both the Idp and SP, so it must use
+    // a conventionally declared logger. The SP has a special logger
+    // setup so this package also logs to the init log.
     private static Logger log = Logger.getLogger(Parser.class);
     
     
@@ -176,7 +180,7 @@ public class Parser {
     public static Document loadDom(InputSource ins, boolean validate) throws SAMLException, SAXException, IOException {
 
                Document doc = null;
-               log.debug("Loading XML from (" + ins.getSystemId() + ")" + (validate ? " with Schema validation" : ""));
+               log.info("Loading XML from (" + ins.getSystemId() + ")" + (validate ? " with Schema validation" : ""));
                if (validate) {
                        doc = org.opensaml.XML.parserPool.parse(ins, schema);
                } else {
@@ -214,8 +218,6 @@ public class Parser {
      * @return A string containing the XML in character form.
      */
     public static String jaxpSerialize(Node dom) {
-        String ret = null;
-        
         TransformerFactory factory = TransformerFactory.newInstance();
         Transformer transformer = null;
         DOMSource source = new DOMSource(dom);
@@ -251,10 +253,12 @@ public class Parser {
         }
         catch (InvalidCanonicalizerException e)
         {
+            log.error("Error obtaining an XML canonicalizer ",e);
             return null;
         }
         catch (CanonicalizationException e)
         {
+            log.error("Error canonicalizing XML ",e);
             return null;
         }
         return new String(bs);
@@ -273,7 +277,6 @@ public class Parser {
        InputSource insrc;
        try {
             InputStream resourceAsStream = 
- //               Parser.class.getResourceAsStream(configFilePath);
                 new ShibResource(configFilePath).getInputStream();
             insrc = new InputSource(resourceAsStream);
             insrc.setSystemId(configFilePath);

diff --git a/src/edu/internet2/middleware/shibboleth/xml/SchemasDirectoryImpl.java b/src/edu/internet2/middleware/shibboleth/xml/SchemasDirectoryImpl.java
index 4f89101..bb7abfd 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/xml/SchemasDirectoryImpl.java
+++ b/src/edu/internet2/middleware/shibboleth/xml/SchemasDirectoryImpl.java
@@ -34,6 +34,9 @@ import org.xml.sax.InputSource;
  */
 public class SchemasDirectoryImpl extends SchemaStore {
     
+    // This class is used by both the Idp and SP, so it must use
+    // a conventionally declared logger. The SP has a special logger
+    // setup so this package also logs to the init log.
     private static Logger log = Logger.getLogger(SchemasDirectoryImpl.class);
     
     private String resourcedir = "/schemas/";
@@ -60,7 +63,6 @@ public class SchemasDirectoryImpl extends SchemaStore {
             return false;
         }
         String[] filenames = dir.list();
-               int nextsource=0;
                for (int i=0;i<filenames.length;i++) {
             String filename = filenames[i];
             if (!filename.endsWith(".xsd"))
@@ -93,9 +95,9 @@ public class SchemasDirectoryImpl extends SchemaStore {
             
             // Put the DOM in the Bucket keyed by namespace
             if (bucket.containsKey(targetNamespace)) {
-                log.debug("Replacing XSD for namespace: "+targetNamespace+" "+filename);
+                log.info("Replacing XSD for namespace: "+targetNamespace+" "+filename);
             } else {
-                log.debug("Defining XSD for namespace:  "+targetNamespace+" "+filename);
+                log.info("Defining XSD for namespace:  "+targetNamespace+" "+filename);
             }
             bucket.put(targetNamespace,xsddom);
         }

diff --git a/src/edu/internet2/middleware/shibboleth/xml/SchemasResourceListImpl.java b/src/edu/internet2/middleware/shibboleth/xml/SchemasResourceListImpl.java
index f3342c2..0143422 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/xml/SchemasResourceListImpl.java
+++ b/src/edu/internet2/middleware/shibboleth/xml/SchemasResourceListImpl.java
@@ -36,6 +36,9 @@ import org.xml.sax.InputSource;
  */
 public class SchemasResourceListImpl extends SchemaStore {
     
+    // This class is used by both the Idp and SP, so it must use
+    // a conventionally declared logger. The SP has a special logger
+    // setup so this package also logs to the init log.
     private static Logger log = Logger.getLogger(SchemasDirectoryImpl.class);
     
     private String resourceprefix = "/schemas/";
@@ -52,8 +55,6 @@ public class SchemasResourceListImpl extends SchemaStore {
     
    
     private void loadBucket() {
-               // for each .xsd file in the directory
-               int nextsource=0;
                for (int i=0;i<resourceNames.length;i++) {
             String filename = resourceNames[i];
             if (!filename.endsWith(".xsd")) {
@@ -94,9 +95,9 @@ public class SchemasResourceListImpl extends SchemaStore {
             
             // Put the DOM in the Bucket keyed by namespace
             if (bucket.containsKey(targetNamespace)) {
-                log.debug("Replacing XSD for namespace: "+targetNamespace+" "+filename);
+                log.info("Replacing XSD for namespace: "+targetNamespace+" "+filename);
             } else {
-                log.debug("Defining XSD for namespace:  "+targetNamespace+" "+filename);
+                log.info("Defining XSD for namespace:  "+targetNamespace+" "+filename);
             }
             bucket.put(targetNamespace,xsddom);
         }