Bump logging to WARN

[java-idp.git] / src / edu / internet2 / middleware / shibboleth / utils / MetadataTool.java

diff --git a/src/edu/internet2/middleware/shibboleth/utils/MetadataTool.java b/src/edu/internet2/middleware/shibboleth/utils/MetadataTool.java
index 4ced4b6..7726b57 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/utils/MetadataTool.java
+++ b/src/edu/internet2/middleware/shibboleth/utils/MetadataTool.java
@@ -19,6 +19,7 @@ package edu.internet2.middleware.shibboleth.utils;
 import jargs.gnu.CmdLineParser;
 
 import java.io.*;
+import java.net.URL;
 import java.security.*;
 import java.security.cert.Certificate;
 import java.security.cert.*;
@@ -152,7 +153,11 @@ public class MetadataTool {
                }
 
                // Parse file and verify root element.
-               Document doc = Parser.loadDom(infile, true);
+               Document doc = Parser.loadDom(new URL(new URL("file:"),infile), true);
+               if (doc == null) {
+                       System.out.println("error: unable to read in file (" + infile + ")");
+                       System.exit(-1);
+               }
                Element e = doc.getDocumentElement();
                if (ns != null && name != null && !org.opensaml.XML.isElementNamed(e, ns, name)) {
                        System.err.println("error: root element did not match ns and name parameters");
@@ -311,8 +316,7 @@ public class MetadataTool {
                        Logger.getRootLogger().setLevel(Level.DEBUG);
                        rootAppender.setLayout(new PatternLayout("%-5p %-41X{serviceId} %d{ISO8601} (%c:%L) - %m%n"));
                } else {
-                       Logger.getRootLogger().setLevel(Level.INFO);
-                       Logger.getLogger("edu.internet2.middleware.shibboleth.aa.attrresolv").setLevel(Level.WARN);
+                       Logger.getRootLogger().setLevel(Level.WARN);
                        rootAppender.setLayout(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN));
                }
                Logger.getLogger("org.apache.xml.security").setLevel(Level.OFF);