ceki        01/06/26 12:40:20

  Modified:    src/java/org/apache/log4j Category.java
               src/java/org/apache/log4j/examples MyCategory.java
               src/java/org/apache/log4j/helpers Makefile
                        VersionHelper.java
               src/java/org/apache/log4j/test mycat
               src/java/org/apache/log4j/xml/examples XCategory.java
  Log:
  - Changed VersionHelper.java to accomodate the case where teh system property 
java.version is null.
    Also simplified the code a little.
  
  - Changed MyCategory.java to use Category.log method.
  
  - Corrections to XCateogry
  
  Revision  Changes    Path
  1.35      +1 -1      jakarta-log4j/src/java/org/apache/log4j/Category.java
  
  Index: Category.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Category.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Category.java     2001/06/26 18:28:45     1.34
  +++ Category.java     2001/06/26 19:40:05     1.35
  @@ -779,7 +779,7 @@
     */
     public
     boolean isEnabledFor(Priority priority) {
  -    if(hierarchy.disable >=  priority.level)
  +    if(hierarchy.disable >=  priority.level) 
         return false;
       return priority.isGreaterOrEqual(this.getChainedPriority());
     }
  
  
  
  1.12      +2 -11     jakarta-log4j/src/java/org/apache/log4j/examples/MyCategory.java
  
  Index: MyCategory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/MyCategory.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MyCategory.java   2001/06/26 11:01:32     1.11
  +++ MyCategory.java   2001/06/26 19:40:08     1.12
  @@ -46,19 +46,10 @@
        end of each message.  */
     public 
     void debug(Object message) {
  -    super.debug(message + " world.");    
  +    super.log(FQCN, Priority.DEBUG, message + " world.", null);    
     }
     
     /**
  -     This makes caller localization to work properly.
  -   */
  -  protected
  -  String getFQCN() {
  -    return MyCategory.FQCN;
  -  }
  -
  -
  -  /**
        This method overrides {@link Category#getInstance} by supplying
        its own factory type as a parameter.
     */
  @@ -70,7 +61,7 @@
   
     public
     void trace(Object message) {
  -    super.log(XPriority.TRACE, message); 
  +    super.log(FQCN, XPriority.TRACE, message, null); 
     }
   }
   
  
  
  
  1.8       +3 -1      jakarta-log4j/src/java/org/apache/log4j/helpers/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/Makefile,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile  2001/04/26 08:16:24     1.7
  +++ Makefile  2001/06/26 19:40:12     1.8
  @@ -20,7 +20,9 @@
        BoundedFIFO.java\
        FileWatchdog.java\
        Loader.java\
  -
  +        VersionHelper.java\
  +        VersionHelper11.java\
  +        VersionHelper20.java\
   
   
   SUBDIRS := 
  
  
  
  1.3       +25 -25    
jakarta-log4j/src/java/org/apache/log4j/helpers/VersionHelper.java
  
  Index: VersionHelper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/VersionHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VersionHelper.java        2001/06/26 10:52:09     1.2
  +++ VersionHelper.java        2001/06/26 19:40:12     1.3
  @@ -8,8 +8,6 @@
   
   package org.apache.log4j.helpers;
   
  -import java.util.StringTokenizer;
  -
   /**
      VersionHelper fixes the classloading trouble when using Log4J in a
      multi-classloader environment like Jakarta Tomcat
  @@ -17,11 +15,10 @@
      @since 1.2
      @author Christopher Taylor */
   abstract public class VersionHelper {
  -     
  -  public static final String VERSION_PROPERTY = "java.version";      
  -  private static VersionHelper helper;
  -
        
  +  static public final String VERSION_PROPERTY = "java.version";      
  +  static private VersionHelper helper;
  +  
     /** VersionHelpers for specific JVM versions override this method,
      *  For example, VersionHelper11 just calls into
      *  <code>Class.forName()</code>, while VersionHelper20 calls into
  @@ -29,7 +26,9 @@
      * @see java.lang.Thread#getContextClassLoader */
     
   
  -  abstract public Class loadClass (String klass_name) throws ClassNotFoundException;
  +  abstract 
  +  public 
  +  Class loadClass (String klass_name) throws ClassNotFoundException;
        
     /** All classes in Log4J that need to dynamically load other classes
      * must use
  @@ -51,27 +50,28 @@
      * @see java.lang.Thread#getContextClassLoader */
     public static VersionHelper getInstance () {
       if (helper == null) {
  -      /* If the helper is null, we'll inspect the System property "java.version" and
  -      figure out which version of the VM we're running on.
  -      Version strings are: [major version].[minor version].[bug fix revision]
  -      So JDK 1.2: 1.2.0
  -      JDK 1.1: 1.1.0 
  -      */
  +      /* Inspect the System property "java.version" and figure out which
  +      version of the VM we're running on.  Version strings are: [major
  +      version].[minor version].[bug fix revision] So JDK 1.2: 1.2.0 JDK
  +      1.1: 1.1.0 */
         String prop = System.getProperty(VERSION_PROPERTY);
  -      StringTokenizer st = new StringTokenizer(prop,".");
  -      st.nextToken(); // Ignore the initial 1
  -      String version = st.nextToken();
  -      try {
  -     /* Here we'll parse the number and decide which version helper to use */
  -     switch (Integer.parseInt(version)) {
  -     case 0:
  -     case 1: helper = new VersionHelper11(); break;
  -     default: helper = new VersionHelper20(); break;
  -     }
  -      } catch (NumberFormatException oops) {
  +      boolean java1 = true;
  +
  +      if(prop != null) {
  +     int i = prop.indexOf('.');
  +     if(i != -1) {   
  +       if(prop.charAt(i+1) != '1')
  +         java1 = false;
  +     } 
  +      }
  +      if(java1) {
        helper = new VersionHelper11();
  -      }  
  +      } else {
  +     helper = new VersionHelper20();
  +      }
       }
       return helper;
     }
  +  
  +  
   }
  
  
  
  1.4       +2 -1      jakarta-log4j/src/java/org/apache/log4j/test/mycat
  
  Index: mycat
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/mycat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mycat     2001/01/05 21:09:07     1.3
  +++ mycat     2001/06/26 19:40:16     1.4
  @@ -12,7 +12,7 @@
   function testSubclassing {
    
    echo -n "Subclassing test $TEST - "
  - java org.apache.log4j.examples.MyCategory $LCF
  + java org.apache.log4j.examples.MyCategoryTest $LCF
    check witness/mycat.$TEST $TEMP; echo "OK."
   }
   
  @@ -31,6 +31,7 @@
   rm $TEMP > /dev/null
   TEST=2
   if [ $TEST -ge $start ]; then
  +   echo "The next test outputs error messages."
     echo "log4j.rootCategory=DEBUG, A1" > $LCF
     lecho "log4j.appender.A1=org.apache.log4j.FileAppender"
     lecho "log4j.appender.A1.File=$TEMP"
  
  
  
  1.12      +5 -13     
jakarta-log4j/src/java/org/apache/log4j/xml/examples/XCategory.java
  
  Index: XCategory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/examples/XCategory.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XCategory.java    2001/06/26 18:29:00     1.11
  +++ XCategory.java    2001/06/26 19:40:18     1.12
  @@ -67,19 +67,11 @@
     */
     public 
     void debug(String message) {
  -    super.debug(message + " " + suffix);
  +    super.log(FQCN, Priority.DEBUG, message + " " + suffix, null);
     }
   
   
     /**
  -     This makes caller localization to work properly.
  -   */
  -  protected
  -  String getFQCN() {
  -    return XCategory.FQCN;
  -  }
  -
  -  /**
        This method overrides {@link Category#getInstance} by supplying
        its own factory type as a parameter.
   
  @@ -119,7 +111,7 @@
       if(hierarchy.isDisabled(XPriority.LETHAL_INT)) 
         return;
       if(XPriority.LETHAL.isGreaterOrEqual(this.getChainedPriority()))
  -      forcedLog(getFQCN(), XPriority.LETHAL, message, t);
  +      forcedLog(FQCN, XPriority.LETHAL, message, t);
     }
   
     /**
  @@ -130,7 +122,7 @@
       if(hierarchy.isDisabled(XPriority.LETHAL_INT)) 
         return;
       if(XPriority.LETHAL.isGreaterOrEqual(this.getChainedPriority()))
  -      forcedLog(getFQCN(), XPriority.LETHAL, message, null);
  +      forcedLog(FQCN, XPriority.LETHAL, message, null);
     }
   
   
  @@ -167,7 +159,7 @@
       if(hierarchy.isDisabled(XPriority.TRACE_INT))
         return;   
       if(XPriority.TRACE.isGreaterOrEqual(this.getChainedPriority()))
  -      forcedLog(getFQCN(), XPriority.TRACE, message, t);
  +      forcedLog(FQCN, XPriority.TRACE, message, t);
     }
   
     /**
  @@ -178,7 +170,7 @@
       if(hierarchy.isDisabled(XPriority.TRACE_INT))
         return;   
       if(XPriority.TRACE.isGreaterOrEqual(this.getChainedPriority()))
  -      forcedLog(getFQCN(), XPriority.TRACE, message, null);
  +      forcedLog(FQCN, XPriority.TRACE, message, null);
     }
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to