You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-cvs@jakarta.apache.org by ce...@apache.org on 2001/09/04 17:23:52 UTC

cvs commit: jakarta-log4j/src/java/org/apache/log4j Priority.java PropertyConfigurator.java

ceki        01/09/04 08:23:52

  Modified:    docs     HISTORY
               src/java/org/apache/log4j Priority.java
                        PropertyConfigurator.java
  Log:
  Priority.DEBUG, Priority.INFO etc. are now full Priority objects, instead of Level objects.
  This is required for backward compatibility.
  
  Revision  Changes    Path
  1.62      +3 -0      jakarta-log4j/docs/HISTORY
  
  Index: HISTORY
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- HISTORY	2001/09/03 22:13:39	1.61
  +++ HISTORY	2001/09/04 15:23:52	1.62
  @@ -14,6 +14,9 @@
      makeNewLoggerInstance. This change requires subclasses of Category
      classes to be modified and recompiled. [**]
   
  + - The Level class replaced the Priority class. Priority class now
  +   extends Level to preserve backward compatibility. [*]
  +
    - The Logger class replaced the Category class. Category class now
      extends Logger to preserve backward compatibility. [*]
   
  
  
  
  1.13      +5 -5      jakarta-log4j/src/java/org/apache/log4j/Priority.java
  
  Index: Priority.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Priority.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Priority.java	2001/09/04 14:53:12	1.12
  +++ Priority.java	2001/09/04 15:23:52	1.13
  @@ -22,11 +22,11 @@
    */
   public class Priority extends Level {
   
  -  //final static public Priority FATAL = new Priority(FATAL_INT, "FATAL", 0);
  -  //final static public Priority ERROR = new Priority(ERROR_INT, "ERROR", 3);
  -  //final static public Priority WARN  = new Priority(WARN_INT, "WARN",  4);
  -  //final static public Priority INFO  = new Priority(INFO_INT, "INFO",  6);
  -  //final static public Priority DEBUG = new Priority(DEBUG_INT, "DEBUG", 7);
  +  final static public Priority FATAL = new Priority(FATAL_INT, "FATAL", 0);
  +  final static public Priority ERROR = new Priority(ERROR_INT, "ERROR", 3);
  +  final static public Priority WARN  = new Priority(WARN_INT, "WARN",  4);
  +  final static public Priority INFO  = new Priority(INFO_INT, "INFO",  6);
  +  final static public Priority DEBUG = new Priority(DEBUG_INT, "DEBUG", 7);
       
     /**
        Instantiate a level object.
  
  
  
  1.34      +1 -1      jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
  
  Index: PropertyConfigurator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- PropertyConfigurator.java	2001/09/03 22:10:10	1.33
  +++ PropertyConfigurator.java	2001/09/04 15:23:52	1.34
  @@ -569,7 +569,7 @@
         // root category.
         if(priorityStr.equalsIgnoreCase(BasicConfigurator.INHERITED) &&
                                   	 !loggerName.equals(INTERNAL_ROOT_NAME)) {
  -	logger.setPriority(null);
  +	logger.setLevel(null);
         } else {
   	logger.setLevel(OptionConverter.toLevel(priorityStr, 
   					     Priority.DEBUG));
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-cvs-help@jakarta.apache.org