Back out change. Fixed by altering script.
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 4 May 2004 03:54:27 +0000 (03:54 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 4 May 2004 03:54:27 +0000 (03:54 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1049 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/edu/internet2/middleware/shibboleth/utils/MetadataTool.java

index f7e742a..d999b15 100644 (file)
@@ -55,10 +55,6 @@ import java.io.*;
 import java.security.*;
 import java.security.cert.Certificate;
 import java.security.cert.*;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
 import org.apache.xml.security.c14n.*;
 import org.apache.xml.security.signature.*;
 import org.apache.xml.security.transforms.*;
@@ -114,9 +110,6 @@ public class MetadataTool
             printUsage(System.out);
             System.exit(0);
         }
-
-
-               configureLogging(false);
         
         Boolean sign = (Boolean)parser.getOptionValue(signOption);
         Boolean noverify = (Boolean)parser.getOptionValue(noverifyOption);
@@ -267,22 +260,5 @@ public class MetadataTool
         out.println();
         System.exit(1);
     }
-       
-       private static void configureLogging(boolean debugEnabled) {
-               ConsoleAppender rootAppender = new ConsoleAppender();
-               rootAppender.setWriter(new PrintWriter(System.out));
-               rootAppender.setName("stdout");
-               Logger.getRootLogger().addAppender(rootAppender);
-
-               if (debugEnabled) {
-                       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);
-                       rootAppender.setLayout(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)); 
-               }
-               Logger.getLogger("org.apache.xml.security").setLevel(Level.OFF);
-       }
 }