geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/cli Main.java
Date Sun, 24 Aug 2003 22:45:40 GMT
jdillon     2003/08/24 15:45:40

  Modified:    modules/core/src/java/org/apache/geronimo Main.java
               modules/twiddle/src/java/org/apache/geronimo/twiddle/cli
                        Main.java
  Log:
   o Moved custom log factory setup to Twiddle CLI so Trace works as expected
  
  Revision  Changes    Path
  1.11      +1 -9      incubator-geronimo/modules/core/src/java/org/apache/geronimo/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/Main.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Main.java	24 Aug 2003 21:10:35 -0000	1.10
  +++ Main.java	24 Aug 2003 22:45:40 -0000	1.11
  @@ -67,7 +67,6 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.commons.logging.impl.LogFactoryImpl;
   
   import org.apache.geronimo.common.StopWatch;
   import org.apache.geronimo.common.Duration;
  @@ -82,13 +81,6 @@
    * @version $Revision$ $Date$
    */
   public class Main implements Runnable {
  -    static {
  -        // Add our default Commons Logger that support the trace level
  -        if(System.getProperty(LogFactoryImpl.LOG_PROPERTY) == null) {
  -            System.setProperty(LogFactoryImpl.LOG_PROPERTY, "org.apache.geronimo.core.log.CachingLog4jLog");
  -        }
  -    }
  -
       private static final Log log = LogFactory.getLog("Geronimo");
       private static final String[] DEPLOY_ARG_TYPES = {"java.net.URL"};
   
  
  
  
  1.8       +9 -1      incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/cli/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/cli/Main.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Main.java	24 Aug 2003 11:20:17 -0000	1.7
  +++ Main.java	24 Aug 2003 22:45:40 -0000	1.8
  @@ -65,6 +65,7 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.apache.commons.logging.impl.LogFactoryImpl;
   
   import org.apache.commons.cli.Options;
   import org.apache.commons.cli.Option;
  @@ -88,6 +89,13 @@
    */
   public class Main
   {
  +    static {
  +        // Add our default Commons Logger that support the trace level
  +        if(System.getProperty(LogFactoryImpl.LOG_PROPERTY) == null) {
  +            System.setProperty(LogFactoryImpl.LOG_PROPERTY, "org.apache.geronimo.core.log.CachingLog4jLog");
  +        }
  +    }
  +    
       private static final Log log = LogFactory.getLog(Main.class);
       
       /** Platform dependent line separator. */
  
  
  

Mime
View raw message