logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject cvs commit: logging-log4j/src/java/org/apache/log4j/spi Configurator.java Filter.java LoggerRepository.java LoggingEvent.java
Date Fri, 29 Oct 2004 18:37:23 GMT
ceki        2004/10/29 11:37:23

  Modified:    .        Tag: v1_2-branch build.xml
               docs     Tag: v1_2-branch overview.html
               src/java/org/apache/log4j Tag: v1_2-branch Appender.java
                        Category.java FileAppender.java Logger.java
                        NDC.java Priority.java TTCCLayout.java
               src/java/org/apache/log4j/config Tag: v1_2-branch
                        PropertyPrinter.java
               src/java/org/apache/log4j/helpers Tag: v1_2-branch
                        BoundedFIFO.java
               src/java/org/apache/log4j/jdbc Tag: v1_2-branch
                        JDBCAppender.java
               src/java/org/apache/log4j/lf5 Tag: v1_2-branch
                        LogRecord.java
               src/java/org/apache/log4j/performance Tag: v1_2-branch
                        Logging.java
               src/java/org/apache/log4j/spi Tag: v1_2-branch
                        Configurator.java Filter.java LoggerRepository.java
                        LoggingEvent.java
  Log:
  NOTE: 1.2.x BRANCH
  
  - Tagged the following methods as deprecated:
  
    public static Category Category.getRoot();
    public static Category Category.getInstance(String);
    public static Category Category.getInstance(Class);
  
  - Cleaning up of javadoc comments.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.34.2.12 +1 -1      logging-log4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/build.xml,v
  retrieving revision 1.34.2.11
  retrieving revision 1.34.2.12
  diff -u -r1.34.2.11 -r1.34.2.12
  --- build.xml	29 Oct 2004 15:42:59 -0000	1.34.2.11
  +++ build.xml	29 Oct 2004 18:37:22 -0000	1.34.2.12
  @@ -17,7 +17,7 @@
     <!-- prefixed with "env". -->
     <property environment="env"/>
   
  -  <property name="version" value="1.2.8"/>
  +  <property name="version" value="1.2.9"/>
   
     <!-- The base directory relative to which most targets are built -->
     <property name="base" value="."/>
  
  
  
  No                   revision
  No                   revision
  1.5.2.1   +1 -0      logging-log4j/docs/overview.html
  
  Index: overview.html
  ===================================================================
  RCS file: /home/cvs/logging-log4j/docs/overview.html,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- overview.html	17 Jan 2002 14:48:59 -0000	1.5
  +++ overview.html	29 Oct 2004 18:37:22 -0000	1.5.2.1
  @@ -7,5 +7,6 @@
   
   <p>Make sure to read the <a href="../manual.html"><b>user manual</b></a>
   in addition to this javadoc documentation.
  +</p>
   
   </body> </html>
  
  
  
  No                   revision
  No                   revision
  1.8.2.1   +1 -1      logging-log4j/src/java/org/apache/log4j/Appender.java
  
  Index: Appender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/Appender.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- Appender.java	28 Sep 2001 13:37:48 -0000	1.8
  +++ Appender.java	29 Oct 2004 18:37:22 -0000	1.8.2.1
  @@ -73,7 +73,7 @@
     /**
        Set the {@link ErrorHandler} for this appender.
   
  -     @ since 0.9.0
  +     @since 0.9.0
      */
     public
     void setErrorHandler(ErrorHandler errorHandler);
  
  
  
  1.68.2.4  +46 -65    logging-log4j/src/java/org/apache/log4j/Category.java
  
  Index: Category.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/Category.java,v
  retrieving revision 1.68.2.3
  retrieving revision 1.68.2.4
  diff -u -r1.68.2.3 -r1.68.2.4
  --- Category.java	29 Oct 2004 15:42:59 -0000	1.68.2.3
  +++ Category.java	29 Oct 2004 18:37:22 -0000	1.68.2.4
  @@ -33,40 +33,48 @@
   
   
   /**
  -   <font color="#AA2222"><b>This class has been deprecated and
  -   replaced by the {@link Logger} <em>subclass</em>.</b></font>
It
  -   will be kept around to preserve backward compatibility until mid
  -   2003.
  -
  -   <p><code>Logger</code> is a subclass of Category, i.e. it extends
  -   Category. In other words, a logger <em>is</em> a category. Thus,
  -   all operations that can be performed on a category can be performed
  -   on a logger. Whenever log4j is asked to produce a Category object,
  -   it will instead produce a Logger object. However, methods that
  -   previously accepted category objects still continue to accept
  -   category objects.
  -
  -   <p>For example, the following are all legal and will work as expected.
  -
  +  * <font color="#AA2222"><b>This class has been deprecated and
  +  * replaced by the {@link Logger} <em>subclass</em></b></font>.
It
  +  * will be kept around to preserve backward compatibility until mid
  +  * 2003.
  +  * 
  +  * <p><code>Logger</code> is a subclass of Category, i.e. it extends
  +  * Category. In other words, a logger <em>is</em> a category. Thus,
  +  * all operations that can be performed on a category can be
  +  * performed on a logger. Internally, whenever log4j is asked to
  +  * produce a Category object, it will instead produce a Logger
  +  * object. Log4j 1.2 will <em>never</em> produce Category objects but
  +  * only <code>Logger</code> instances. In order to preserve backward
  +  * compatibility, methods that previously accepted category objects
  +  * still continue to accept category objects.
  +  * 
  +  * <p>For example, the following are all legal and will work as
  +  * expected.
  +  * 
      <pre>
  -   &nbsp;&nbsp;&nbsp;// Deprecated form:
  -   &nbsp;&nbsp;&nbsp;Category cat = Category.getInstance("foo.bar")
  -
  -   &nbsp;&nbsp;&nbsp;// Preferred form for retrieving loggers:
  -   &nbsp;&nbsp;&nbsp;Logger logger = Logger.getLogger("foo.bar")
  +    &nbsp;&nbsp;&nbsp;// Deprecated form:
  +    &nbsp;&nbsp;&nbsp;Category cat = Category.getInstance("foo.bar")
  +   
  +    &nbsp;&nbsp;&nbsp;// Preferred form for retrieving loggers:
  +    &nbsp;&nbsp;&nbsp;Logger logger = Logger.getLogger("foo.bar")
      </pre>
  -
  -   <p>The first form is deprecated and should be avoided.
  -
  -   <p><b>There is absolutely no need for new client code to use or
  -   refer to the <code>Category</code> class.</b> Whenever possible,
  -   please avoid referring to it or using it.
  -
  -  <p>See the <a href="../../../../manual.html">short manual</a> for an
  -  introduction on this class.
  -
  -  @author Ceki G&uuml;lc&uuml;
  -  @author Anders Kristensen */
  +   
  +  *  <p>The first form is deprecated and should be avoided.
  +  * 
  +  *  <p><b>There is absolutely no need for new client code to use or
  +  *  refer to the <code>Category</code> class.</b> Whenever possible,
  +  *  please avoid referring to it or using it.
  +  * 
  +  * <p>See the <a href="../../../../manual.html">short manual</a> for
an
  +  * introduction on this class.
  +  * 
  +  * <p>See the document entitled the <a
  +  * href="http://www.qos.ch/logging/replacingCategory.html">replacement
  +  * of Logger by Category</a> for a deeper discussion.
  +  *
  +  * @author Ceki G&uuml;lc&uuml;
  +  * @author Anders Kristensen 
  +  */
   public class Category implements AppenderAttachable {
   
     /**
  @@ -312,7 +320,7 @@
   
        @deprecated Please use {@link LogManager#exists} instead.
   
  -     @version 0.8.5 */
  +     @since 0.8.5 */
     public
     static
     Logger exists(String name) {
  @@ -495,19 +503,8 @@
   
   
    /**
  -     Retrieve a category with named as the <code>name</code>
  -     parameter. If the named category already exists, then the
  -     existing instance will be reutrned. Otherwise, a new instance is
  -     created.
  -
  -     By default, categories do not have a set level but inherit
  -     it from the hierarchy. This is one of the central features of
  -     log4j.
  -
  -     <b>Deprecated</b> Please use {@link Logger#getLogger(String)}
  -     instead.
  -
  -     @param name The name of the category to retrieve.  */
  +  * @deprecated Make sure to use {@link Logger#getLogger(String)} instead.
  +  */
     public
     static
     Category getInstance(String name) {
  @@ -515,15 +512,8 @@
     }
   
    /**
  -    Shorthand for <code>getInstance(clazz.getName())</code>.
  -
  -    @param clazz The name of <code>clazz</code> will be used as the
  -    name of the category to retrieve.  See {@link
  -    #getInstance(String)} for more detailed information.
  -
  -    <b>Deprecated</b> Please use {@link Logger#getLogger(Class)} instead.
  -
  -    @since 1.0 */
  +  * @deprecated Please make sure to use {@link Logger#getLogger(Class)} instead.
  +  */ 
     public
     static
     Category getInstance(Class clazz) {
  @@ -577,16 +567,7 @@
   
   
     /**
  -     Return the root of the default category hierrachy.
  -
  -     <p>The root category is always instantiated and available. It's
  -     name is "root".
  -
  -     <p>Nevertheless, calling {@link #getInstance
  -     Category.getInstance("root")} does not retrieve the root category
  -     but a category just under root named "root".
  -
  -     <b>Deprecated</b> Use {@link Logger#getRootLogger()} instead.
  +   *  @deprecated Please use {@link Logger#getRootLogger()} instead.
      */
     final
     public
  
  
  
  1.34.2.2  +10 -9     logging-log4j/src/java/org/apache/log4j/FileAppender.java
  
  Index: FileAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/FileAppender.java,v
  retrieving revision 1.34.2.1
  retrieving revision 1.34.2.2
  diff -u -r1.34.2.1 -r1.34.2.2
  --- FileAppender.java	11 Jun 2002 13:17:38 -0000	1.34.2.1
  +++ FileAppender.java	29 Oct 2004 18:37:22 -0000	1.34.2.2
  @@ -30,14 +30,14 @@
    * */
   public class FileAppender extends WriterAppender {
   
  -  /** Append to or truncate the file? The default value for this
  -      variable is <code>true</code>, meaning that by default a
  -      <code>FileAppender</code> will append to an existing file and
  -      not truncate it.
  -
  -      <p>This option is meaningful only if the FileAppender opens the
  -      file.
  -  */
  +  /** Controls file truncatation. The default value for this variable
  +   * is <code>true</code>, meaning that by default a
  +   * <code>FileAppender</code> will append to an existing file and not
  +   * truncate it.
  +   *
  +   * <p>This option is meaningful only if the FileAppender opens the
  +   * file.
  +   */
     protected boolean fileAppend = true;
   
     /**
  @@ -49,7 +49,8 @@
     protected boolean bufferedIO = false;
   
     /**
  -     How big should the IO buffer be? Default is 8K. */
  +   * Determines the size of IO buffer be. Default is 8K. 
  +   */
     protected int bufferSize = 8*1024;
   
   
  
  
  
  1.16.2.1  +24 -3     logging-log4j/src/java/org/apache/log4j/Logger.java
  
  Index: Logger.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/Logger.java,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -u -r1.16 -r1.16.2.1
  --- Logger.java	25 Apr 2002 22:22:07 -0000	1.16
  +++ Logger.java	29 Oct 2004 18:37:22 -0000	1.16.2.1
  @@ -77,7 +77,16 @@
     //}
   
     /**
  -     Retrieve a logger by name.
  +   * Retrieve a logger named according to the value of the
  +   * <code>name</code> parameter. If the named logger already exists,
  +   * then the existing instance will be returned. Otherwise, a new
  +   * instance is created.  
  +   *
  +   * <p>By default, loggers do not have a set level but inherit it
  +   * from their neareast ancestor with a set level. This is one of the
  +   * central features of log4j.
  +   *
  +   * @param name The name of the logger to retrieve.  
     */
     static
     public
  @@ -86,7 +95,11 @@
     }
   
     /**
  -     Same as calling <code>getLogger(clazz.getName())</code>.
  +   * Shorthand for <code>getLogger(clazz.getName())</code>.
  +   *
  +   * @param clazz The name of <code>clazz</code> will be used as the
  +   * name of the logger to retrieve.  See {@link #getLogger(String)}
  +   * for more detailed information.
      */
     static
     public
  @@ -96,7 +109,15 @@
   
   
     /**
  -     Retrieve the root logger.
  +   * Return the root logger for the current logger repository.
  +   * <p>
  +   * The {@link #getName Logger.getName()} method for the root logger always returns
  +   * stirng value: "root". However, calling
  +   * <code>Logger.getLogger("root")</code> does not retrieve the root
  +   * logger but a logger just under root named "root".
  +   * <p>
  +   * In other words, calling this method is the only way to retrieve the 
  +   * root logger.
      */
     public
     static
  
  
  
  1.13.2.3  +5 -5      logging-log4j/src/java/org/apache/log4j/NDC.java
  
  Index: NDC.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/NDC.java,v
  retrieving revision 1.13.2.2
  retrieving revision 1.13.2.3
  diff -u -r1.13.2.2 -r1.13.2.3
  --- NDC.java	29 Oct 2004 15:42:59 -0000	1.13.2.2
  +++ NDC.java	29 Oct 2004 18:37:22 -0000	1.13.2.3
  @@ -193,7 +193,7 @@
   
     /**
        <font color="#FF4040"><b>Never use this method directly, use the {@link
  -     org.apache.log4j.spi.LoggingEvent#getNDC} method instead.</b></font>
  +     org.apache.log4j.spi.LoggingEvent#getNDC} method instead</b></font>.
     */
     static
     public
  @@ -206,10 +206,10 @@
     }
     
     /**
  -     Get the current nesting depth of this diagnostic context.
  -
  -     @see #setMaxDepth
  -     @since 0.7.5
  +   * Get the current nesting depth of this diagnostic context.
  +   *
  +   * @see #setMaxDepth
  +   * @since 0.7.5
      */
     public
     static
  
  
  
  1.23.2.1  +1 -1      logging-log4j/src/java/org/apache/log4j/Priority.java
  
  Index: Priority.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/Priority.java,v
  retrieving revision 1.23
  retrieving revision 1.23.2.1
  diff -u -r1.23 -r1.23.2.1
  --- Priority.java	9 May 2002 15:43:43 -0000	1.23
  +++ Priority.java	29 Oct 2004 18:37:22 -0000	1.23.2.1
  @@ -12,7 +12,7 @@
   
   /**
      <font color="#AA4444">Refrain from using this class directly, use
  -   the {@link Level} class instead.</font>
  +   the {@link Level} class instead</font>.
   
      @author Ceki G&uuml;lc&uuml; */
   public class Priority {
  
  
  
  1.16.2.2  +1 -3      logging-log4j/src/java/org/apache/log4j/TTCCLayout.java
  
  Index: TTCCLayout.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/TTCCLayout.java,v
  retrieving revision 1.16.2.1
  retrieving revision 1.16.2.2
  diff -u -r1.16.2.1 -r1.16.2.2
  --- TTCCLayout.java	31 Jul 2002 09:25:12 -0000	1.16.2.1
  +++ TTCCLayout.java	29 Oct 2004 18:37:22 -0000	1.16.2.2
  @@ -157,9 +157,7 @@
      <p>Time, thread, category and diagnostic context are printed
      depending on options.
   
  -    @param category
  -    @param level
  -    @param message
  +    @param event The event to format
   
     */
     public
  
  
  
  No                   revision
  No                   revision
  1.2.2.3   +2 -2      logging-log4j/src/java/org/apache/log4j/config/PropertyPrinter.java
  
  Index: PropertyPrinter.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/config/PropertyPrinter.java,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- PropertyPrinter.java	29 Oct 2004 15:43:00 -0000	1.2.2.2
  +++ PropertyPrinter.java	29 Oct 2004 18:37:22 -0000	1.2.2.3
  @@ -46,8 +46,8 @@
     }
     
     /**
  -     Returns true if the specified appender name is considered to have
  -     been generated, i.e. if it is of the form A[0-9]+.
  +   * Returns true if the specified appender name is considered to have
  +   * been generated, that is, if it is of the form A[0-9]+.
     */
     protected
     boolean isGenAppName(String name) {
  
  
  
  No                   revision
  No                   revision
  1.6.2.1   +2 -2      logging-log4j/src/java/org/apache/log4j/helpers/BoundedFIFO.java
  
  Index: BoundedFIFO.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/helpers/BoundedFIFO.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- BoundedFIFO.java	5 Jul 2001 19:09:35 -0000	1.6
  +++ BoundedFIFO.java	29 Oct 2004 18:37:22 -0000	1.6.2.1
  @@ -82,8 +82,8 @@
     }
   
     /**
  -     Return <code>true</code> if the buffer is full, i.e. of the
  -     number of elements in the buffer equals the buffer size. */
  +     Return <code>true</code> if the buffer is full, that is, whether
  +     the number of elements in the buffer equals the buffer size. */
     public 
     boolean isFull() {
       return numElements == maxSize;
  
  
  
  No                   revision
  No                   revision
  1.6.2.5   +5 -5      logging-log4j/src/java/org/apache/log4j/jdbc/JDBCAppender.java
  
  Index: JDBCAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/jdbc/JDBCAppender.java,v
  retrieving revision 1.6.2.4
  retrieving revision 1.6.2.5
  diff -u -r1.6.2.4 -r1.6.2.5
  --- JDBCAppender.java	19 Feb 2003 14:24:05 -0000	1.6.2.4
  +++ JDBCAppender.java	29 Oct 2004 18:37:22 -0000	1.6.2.5
  @@ -14,9 +14,9 @@
   
   
   /**
  -   <p><b><font color="#FF2222">WARNING: This version of JDBCAppender
  -   is very likely to be completely replaced in the future. Moreoever,
  -   it does not log exceptions.</font></b> </p>
  +  <p><b><font color="#FF2222">WARNING: This version of JDBCAppender
  +  is very likely to be completely replaced in the future. Moreoever,
  +  it does not log exceptions</font></b>.
   
     The JDBCAppender provides for sending log events to a database.
     
  @@ -58,7 +58,7 @@
   
       </ul>
   
  -    @author: Kevin Steppe (<A HREF="mailto:ksteppe@pacbell.net">ksteppe@pacbell.net</A>)
  +    @author Kevin Steppe (<A HREF="mailto:ksteppe@pacbell.net">ksteppe@pacbell.net</A>)
   
   */
   public class JDBCAppender extends org.apache.log4j.AppenderSkeleton
  @@ -91,7 +91,7 @@
     /**
      * Stores the string given to the pattern layout for conversion into a SQL
      * statement, eg: insert into LogTable (Thread, Class, Message) values
  -   * ("%t", "%c", "%m")
  +   * ("%t", "%c", "%m").
      *
      * Be careful of quotes in your messages!
      *
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +1 -1      logging-log4j/src/java/org/apache/log4j/lf5/LogRecord.java
  
  Index: LogRecord.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/lf5/LogRecord.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- LogRecord.java	26 Apr 2002 15:48:42 -0000	1.1
  +++ LogRecord.java	29 Oct 2004 18:37:22 -0000	1.1.2.1
  @@ -350,7 +350,7 @@
     /**
      * Set the location in code where this LogRecord originated.
      *
  -   * @param ndc A string containing location information.
  +   * @param location A string containing location information.
      */
     public void setLocation(String location) {
       _location = location;
  
  
  
  No                   revision
  No                   revision
  1.11.2.2  +10 -10    logging-log4j/src/java/org/apache/log4j/performance/Attic/Logging.java
  
  Index: Logging.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/performance/Attic/Logging.java,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- Logging.java	29 Oct 2004 15:43:00 -0000	1.11.2.1
  +++ Logging.java	29 Oct 2004 18:37:22 -0000	1.11.2.2
  @@ -201,16 +201,16 @@
     }
   
     /**
  -     <b>Usage:</b> <code>java org.apache.log4j.performance.Logging confFile
runLength [delay] [burstLen]</code>
  -
  -     <p><code>confFile</code> is an XML configuration file and
  -      <code>runLength</code> (integer) is the length of test loop,
  -      <code>delay</code> is the time in millisecs to sleep every
  -      <code>bustLen</code> log requests.
  -
  -      <p>This application just prints the average time it took to log.
  -
  -
  +   * The main method.
  +   *
  +   * <b>Usage:</b> <code>java org.apache.log4j.performance.Logging confFile
runLength [delay] [burstLen]</code>
  +   * 
  +   * <p><code>confFile</code> is an XML configuration file and
  +   * <code>runLength</code> (integer) is the length of test loop,
  +   * <code>delay</code> is the time in millisecs to sleep every
  +   * <code>bustLen</code> log requests.
  +   *
  +   *  <p>This application just prints the average time it took to log.
      */
     public static void main(String argv[]) {
   
  
  
  
  No                   revision
  No                   revision
  1.8.2.2   +1 -1      logging-log4j/src/java/org/apache/log4j/spi/Configurator.java
  
  Index: Configurator.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/spi/Configurator.java,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- Configurator.java	22 May 2002 17:15:20 -0000	1.8.2.1
  +++ Configurator.java	29 Oct 2004 18:37:22 -0000	1.8.2.2
  @@ -39,7 +39,7 @@
        parameter.
   
        @param url The URL to parse
  -     @param hierarchy The hierarchy to operation upon.
  +     @param repository The hierarchy to operation upon.
      */
     void doConfigure(URL url, LoggerRepository repository);
   }
  
  
  
  1.4.2.1   +1 -1      logging-log4j/src/java/org/apache/log4j/spi/Filter.java
  
  Index: Filter.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/spi/Filter.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- Filter.java	5 Jul 2001 19:07:19 -0000	1.4
  +++ Filter.java	29 Oct 2004 18:37:22 -0000	1.4.2.1
  @@ -91,7 +91,7 @@
        the chain.
   
        @param event The LoggingEvent to decide upon.
  -     @param decision The decision of the filter.  */
  +     @return decision The decision of the filter.  */
     abstract
     public
     int decide(LoggingEvent event);
  
  
  
  1.9.2.1   +4 -3      logging-log4j/src/java/org/apache/log4j/spi/LoggerRepository.java
  
  Index: LoggerRepository.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/spi/LoggerRepository.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- LoggerRepository.java	24 Apr 2002 01:16:11 -0000	1.9
  +++ LoggerRepository.java	29 Oct 2004 18:37:22 -0000	1.9.2.1
  @@ -31,9 +31,10 @@
     void addHierarchyEventListener(HierarchyEventListener listener);
   
     /**
  -     Is the repository disabled for a given level? The answer depends
  -     on the repository threshold and the <code>level</code>
  -     parameter. See also {@link #setThreshold} method.  */
  +     Returns whether this repository is disabled for a given
  +     level. The answer depends on the repository threshold and the
  +     <code>level</code> parameter. See also {@link #setThreshold}
  +     method.  */
     boolean isDisabled(int level);
   
     /**
  
  
  
  1.31.2.6  +6 -6      logging-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java
  
  Index: LoggingEvent.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java,v
  retrieving revision 1.31.2.5
  retrieving revision 1.31.2.6
  diff -u -r1.31.2.5 -r1.31.2.6
  --- LoggingEvent.java	29 Oct 2004 15:43:00 -0000	1.31.2.5
  +++ LoggingEvent.java	29 Oct 2004 18:37:22 -0000	1.31.2.6
  @@ -130,16 +130,16 @@
        <p>Except {@link #timeStamp} all the other fields of
        <code>LoggingEvent</code> are filled when actually needed.
        <p>
  -     @param category The category of this event.
  +     @param logger The logger generating this event.
        @param level The level of this event.
        @param message  The message of this event.
        @param throwable The throwable of this event.  */
     public LoggingEvent(String fqnOfCategoryClass, Category logger,
  -		      Priority priority, Object message, Throwable throwable) {
  +		      Priority level, Object message, Throwable throwable) {
       this.fqnOfCategoryClass = fqnOfCategoryClass;
       this.logger = logger;
       this.categoryName = logger.getName();
  -    this.level = priority;
  +    this.level = level;
       this.message = message;
       if(throwable != null) {
         this.throwableInfo = new ThrowableInformation(throwable);
  @@ -153,18 +153,18 @@
        <p>Except {@link #timeStamp} all the other fields of
        <code>LoggingEvent</code> are filled when actually needed.
        <p>
  -     @param category The category of this event.
  +     @param logger The logger generating this event.
        @param timeStamp the timestamp of this logging event
        @param level The level of this event.
        @param message  The message of this event.
        @param throwable The throwable of this event.  */
     public LoggingEvent(String fqnOfCategoryClass, Category logger,
  -		      long timeStamp, Priority priority, Object message,
  +		      long timeStamp, Priority level, Object message,
   		      Throwable throwable) {
       this.fqnOfCategoryClass = fqnOfCategoryClass;
       this.logger = logger;
       this.categoryName = logger.getName();
  -    this.level = priority;
  +    this.level = level;
       this.message = message;
       if(throwable != null) {
         this.throwableInfo = new ThrowableInformation(throwable);
  
  
  

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


Mime
View raw message