logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject cvs commit: jakarta-log4j/src/java/org/apache/log4j/xml/examples XMLSample.java
Date Mon, 05 May 2003 20:42:59 GMT
ceki        2003/05/05 13:42:58

  Modified:    .        build.xml
               src/java/org/apache/log4j HTMLLayout.java
               src/java/org/apache/log4j/chainsaw XMLFileHandler.java
               src/java/org/apache/log4j/config PropertyPrinter.java
               src/java/org/apache/log4j/helpers FileWatchdog.java
                        Transform.java
               src/java/org/apache/log4j/jdbc JDBCAppender.java
               src/java/org/apache/log4j/net JMSReceiver.java JMSSink.java
                        SimpleSocketServer.java SocketAppender.java
                        SocketHubReceiver.java SocketNode.java
                        SocketReceiver.java
               src/java/org/apache/log4j/nt NTEventLogAppender.java
               src/java/org/apache/log4j/rolling RollingFileAppender.java
                        RollingPolicy.java SlidingWindowRollingPolicy.java
               src/java/org/apache/log4j/spi RendererSupport.java
               src/java/org/apache/log4j/test AsyncAppenderTest.java
                        DRFATest.java DelayedLoop.java Finalize.java
                        Shallow.java StressAsyncAppender.java
               src/java/org/apache/log4j/varia
                        ExternallyRolledFileAppender.java
                        LevelRangeFilter.java NullAppender.java
                        StringMatchFilter.java
               src/java/org/apache/log4j/xml DOMConfigurator.java
                        Log4jEntityResolver.java XMLLayout.java
               src/java/org/apache/log4j/xml/examples XMLSample.java
  Log:
  Cosmetic changes only.
  
  - Removed unused imports.
  
  - Replaced  Thread.currentThread().sleep(millis) calls with its
    cleaner equivalent Thread.sleep(millis)
  
  Revision  Changes    Path
  1.60      +1 -1      jakarta-log4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/build.xml,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- build.xml	1 May 2003 18:08:00 -0000	1.59
  +++ build.xml	5 May 2003 20:42:54 -0000	1.60
  @@ -199,7 +199,7 @@
                       **/doc-files/*,
                       ${stem}/xml/**,
                       ${stem}/test/serialization/**,
  -		            ${stem}/net/SMTPAppender.java,
  +	            ${stem}/net/SMTPAppender.java,
                  	    ${stem}/net/JMS*.java,
                  	    ${stem}/jmx/*.java,
                       ${stem}/varia/Log4JAvalonLogger.java,
  
  
  
  1.30      +1 -1      jakarta-log4j/src/java/org/apache/log4j/HTMLLayout.java
  
  Index: HTMLLayout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/HTMLLayout.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- HTMLLayout.java	18 Mar 2003 21:17:42 -0000	1.29
  +++ HTMLLayout.java	5 May 2003 20:42:55 -0000	1.30
  @@ -154,7 +154,7 @@
       sbuf.append(Layout.LINE_SEP + "<tr>" + Layout.LINE_SEP);
   
       sbuf.append("<td>");
  -    sbuf.append(event.timeStamp - event.getStartTime());
  +    sbuf.append(event.timeStamp - LoggingEvent.getStartTime());
       sbuf.append("</td>" + Layout.LINE_SEP);
   
       sbuf.append("<td title=\"" + event.getThreadName() + " thread\">");
  
  
  
  1.12      +2 -1      jakarta-log4j/src/java/org/apache/log4j/chainsaw/XMLFileHandler.java
  
  Index: XMLFileHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/XMLFileHandler.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XMLFileHandler.java	20 Mar 2003 05:42:46 -0000	1.11
  +++ XMLFileHandler.java	5 May 2003 20:42:55 -0000	1.12
  @@ -51,6 +51,7 @@
   
   import org.apache.log4j.Logger;
   import org.apache.log4j.Priority;
  +import org.apache.log4j.Level;
   
   import org.xml.sax.Attributes;
   import org.xml.sax.InputSource;
  @@ -183,7 +184,7 @@
           mCategoryName = aAtts.getValue("category");
         }
   
  -      mPriority = Priority.toPriority(aAtts.getValue("level"));
  +      mPriority = Level.toLevel(aAtts.getValue("level"));
       } else if (TAG_LOCATION_INFO.equals(aQName)) {
         mLocationDetails =
           aAtts.getValue("class") + "." + aAtts.getValue("method") + "("
  
  
  
  1.4       +9 -10     jakarta-log4j/src/java/org/apache/log4j/config/PropertyPrinter.java
  
  Index: PropertyPrinter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/config/PropertyPrinter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PropertyPrinter.java	20 May 2002 09:52:57 -0000	1.3
  +++ PropertyPrinter.java	5 May 2003 20:42:55 -0000	1.4
  @@ -36,7 +36,7 @@
       this.out = out;
       this.doCapitalize = doCapitalize;
       
  -    print(out);
  +    //print(out);
       out.flush();
     }
     
  @@ -65,15 +65,14 @@
      * 
      * <p>N.B. print() can be invoked only once!
      */
  -  public
  -  void print(PrintWriter out) {
  -    printOptions(out, Category.getRoot());
  -    
  -    Enumeration cats = Category.getCurrentCategories();
  -    while (cats.hasMoreElements()) {
  -      printOptions(out, (Category) cats.nextElement());
  -    }
  -  }
  +  //public void print(PrintWriter out) {
  +  //printOptions(out, Category.getRoot());
  +  //
  +  //  Enumeration cats = Category.getCurrentCategories();
  +  //while (cats.hasMoreElements()) {
  +  //  printOptions(out, (Category) cats.nextElement());
  +  //}
  +  //}
     
     protected
     void printOptions(PrintWriter out, Category cat) {
  
  
  
  1.5       +1 -1      jakarta-log4j/src/java/org/apache/log4j/helpers/FileWatchdog.java
  
  Index: FileWatchdog.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/FileWatchdog.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FileWatchdog.java	30 Jan 2001 00:04:19 -0000	1.4
  +++ FileWatchdog.java	5 May 2003 20:42:55 -0000	1.5
  @@ -92,7 +92,7 @@
     void run() {    
       while(!interrupted) {
         try {
  -	Thread.currentThread().sleep(delay);
  +        Thread.sleep(delay);
         } catch(InterruptedException e) {
   	// no interruption expected
         }
  
  
  
  1.4       +0 -3      jakarta-log4j/src/java/org/apache/log4j/helpers/Transform.java
  
  Index: Transform.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/Transform.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Transform.java	3 Mar 2003 15:24:03 -0000	1.3
  +++ Transform.java	5 May 2003 20:42:55 -0000	1.4
  @@ -7,9 +7,6 @@
   
   package org.apache.log4j.helpers;
   
  -import org.apache.log4j.spi.LoggingEvent;
  -import org.apache.log4j.spi.LocationInfo;
  -
   /**
      Utility class for transforming strings.
   
  
  
  
  1.9       +0 -1      jakarta-log4j/src/java/org/apache/log4j/jdbc/JDBCAppender.java
  
  Index: JDBCAppender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/jdbc/JDBCAppender.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JDBCAppender.java	19 Feb 2003 05:21:42 -0000	1.8
  +++ JDBCAppender.java	5 May 2003 20:42:56 -0000	1.9
  @@ -1,6 +1,5 @@
   package org.apache.log4j.jdbc;
   
  -import org.apache.log4j.*;
   import org.apache.log4j.spi.*;
   import org.apache.log4j.PatternLayout;
   
  
  
  
  1.4       +0 -2      jakarta-log4j/src/java/org/apache/log4j/net/JMSReceiver.java
  
  Index: JMSReceiver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/JMSReceiver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JMSReceiver.java	19 Mar 2003 07:03:34 -0000	1.3
  +++ JMSReceiver.java	5 May 2003 20:42:56 -0000	1.4
  @@ -24,9 +24,7 @@
   
   import org.apache.log4j.Logger;
   import org.apache.log4j.spi.LoggingEvent;
  -import org.apache.log4j.spi.LoggerRepository;
   import org.apache.log4j.plugins.Receiver;
  -import org.apache.log4j.helpers.LogLog;
   
   /**
     JMSReceiver receives a remote logging event on a configured
  
  
  
  1.14      +3 -10     jakarta-log4j/src/java/org/apache/log4j/net/JMSSink.java
  
  Index: JMSSink.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/JMSSink.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JMSSink.java	9 Oct 2002 22:50:04 -0000	1.13
  +++ JMSSink.java	5 May 2003 20:42:56 -0000	1.14
  @@ -9,16 +9,10 @@
   
   import org.apache.log4j.spi.LoggingEvent;
   import org.apache.log4j.Logger;
  -import org.apache.log4j.LogManager;
  -import org.apache.log4j.spi.RendererSupport;
  -import org.apache.log4j.spi.LoggerRepository;
  -import org.apache.log4j.or.jms.MessageRenderer;
   import org.apache.log4j.PropertyConfigurator;
   import org.apache.log4j.xml.DOMConfigurator;
  -import org.apache.log4j.helpers.LogLog;
   
  -import javax.jms.Message;
  -import javax.jms.MessageListener;
  +
   import javax.jms.TopicConnection;
   import javax.jms.Topic;
   import javax.jms.TopicConnectionFactory;
  @@ -35,7 +29,6 @@
   import javax.naming.Context;
   import javax.naming.NameNotFoundException;
   import javax.naming.NamingException;
  -import java.util.Properties;
   
   /**
    * A simple application that consumes logging events sent by a {@link
  @@ -62,9 +55,9 @@
       String configFile = args[4];
   
       if(configFile.endsWith(".xml")) {
  -      new DOMConfigurator().configure(configFile);
  +      DOMConfigurator.configure(configFile);
       } else {
  -      new PropertyConfigurator().configure(configFile);
  +      PropertyConfigurator.configure(configFile);
       }
       
       new JMSSink(tcfBindingName, topicBindingName, username, password);
  
  
  
  1.6       +2 -2      jakarta-log4j/src/java/org/apache/log4j/net/SimpleSocketServer.java
  
  Index: SimpleSocketServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/SimpleSocketServer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SimpleSocketServer.java	9 Oct 2002 22:50:04 -0000	1.5
  +++ SimpleSocketServer.java	5 May 2003 20:42:56 -0000	1.6
  @@ -79,9 +79,9 @@
       }
      
       if(configFile.endsWith(".xml")) {
  -      new DOMConfigurator().configure(configFile);
  +      DOMConfigurator.configure(configFile);
       } else {
  -      new PropertyConfigurator().configure(configFile);
  +      PropertyConfigurator.configure(configFile);
       }
     }
   }
  
  
  
  1.15      +1 -1      jakarta-log4j/src/java/org/apache/log4j/net/SocketAppender.java
  
  Index: SocketAppender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/SocketAppender.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SocketAppender.java	18 Feb 2003 00:49:02 -0000	1.14
  +++ SocketAppender.java	5 May 2003 20:42:56 -0000	1.15
  @@ -14,7 +14,7 @@
   import java.net.Socket;
   import java.io.IOException;
   import java.io.ObjectOutputStream;
  -import java.io.ObjectOutputStream;
  +
   
   import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.spi.LoggingEvent;
  
  
  
  1.2       +0 -2      jakarta-log4j/src/java/org/apache/log4j/net/SocketHubReceiver.java
  
  Index: SocketHubReceiver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/SocketHubReceiver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SocketHubReceiver.java	8 Feb 2003 07:17:01 -0000	1.1
  +++ SocketHubReceiver.java	5 May 2003 20:42:56 -0000	1.2
  @@ -10,8 +10,6 @@
   import java.io.IOException;
   import java.net.Socket;
   
  -import org.apache.log4j.Logger;
  -import org.apache.log4j.spi.LoggingEvent;
   import org.apache.log4j.spi.LoggerRepository;
   import org.apache.log4j.plugins.Receiver;
   import org.apache.log4j.helpers.LogLog;
  
  
  
  1.27      +5 -5      jakarta-log4j/src/java/org/apache/log4j/net/SocketNode.java
  
  Index: SocketNode.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/SocketNode.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- SocketNode.java	19 Mar 2003 07:03:34 -0000	1.26
  +++ SocketNode.java	5 May 2003 20:42:56 -0000	1.27
  @@ -8,15 +8,15 @@
   
   package org.apache.log4j.net;
   
  -import java.net.InetAddress;
  -import java.net.Socket;
  +import java.io.BufferedInputStream;
   import java.io.IOException;
   import java.io.ObjectInputStream;
  -import java.io.BufferedInputStream;
  +import java.net.Socket;
   
  -import org.apache.log4j.*;
  -import org.apache.log4j.spi.*;
  +import org.apache.log4j.Logger;
   import org.apache.log4j.plugins.Receiver;
  +import org.apache.log4j.spi.LoggerRepository;
  +import org.apache.log4j.spi.LoggingEvent;
   
   // Contributors:  Moses Hohman <mmhohman@rainbow.uchicago.edu>
   
  
  
  
  1.4       +0 -2      jakarta-log4j/src/java/org/apache/log4j/net/SocketReceiver.java
  
  Index: SocketReceiver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/SocketReceiver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SocketReceiver.java	11 Dec 2002 07:30:31 -0000	1.3
  +++ SocketReceiver.java	5 May 2003 20:42:56 -0000	1.4
  @@ -11,8 +11,6 @@
   import java.net.Socket;
   import java.net.ServerSocket;
   
  -import org.apache.log4j.Logger;
  -import org.apache.log4j.spi.LoggingEvent;
   import org.apache.log4j.spi.LoggerRepository;
   import org.apache.log4j.plugins.Receiver;
   import org.apache.log4j.helpers.LogLog;
  
  
  
  1.18      +0 -3      jakarta-log4j/src/java/org/apache/log4j/nt/NTEventLogAppender.java
  
  Index: NTEventLogAppender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/nt/NTEventLogAppender.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- NTEventLogAppender.java	9 Oct 2002 22:50:04 -0000	1.17
  +++ NTEventLogAppender.java	5 May 2003 20:42:57 -0000	1.18
  @@ -12,9 +12,6 @@
   import org.apache.log4j.Level;
   import org.apache.log4j.helpers.LogLog;
   
  -import java.io.*;
  -
  -
   /**
      Append to the NT event log system.
   
  
  
  
  1.3       +0 -4      jakarta-log4j/src/java/org/apache/log4j/rolling/RollingFileAppender.java
  
  Index: RollingFileAppender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/rolling/RollingFileAppender.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RollingFileAppender.java	23 Apr 2003 21:28:57 -0000	1.2
  +++ RollingFileAppender.java	5 May 2003 20:42:57 -0000	1.3
  @@ -50,15 +50,11 @@
   package org.apache.log4j.rolling;
   
   import org.apache.log4j.FileAppender;
  -import org.apache.log4j.helpers.CountingQuietWriter;
   import org.apache.log4j.helpers.LogLog;
  -import org.apache.log4j.helpers.OptionConverter;
   import org.apache.log4j.spi.LoggingEvent;
   
   import java.io.File;
   import java.io.IOException;
  -import java.io.Writer;
  -
   
   /**
    * RollingFileAppender extends FileAppender to backup the log files
  
  
  
  1.2       +1 -1      jakarta-log4j/src/java/org/apache/log4j/rolling/RollingPolicy.java
  
  Index: RollingPolicy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/rolling/RollingPolicy.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RollingPolicy.java	23 Apr 2003 21:28:57 -0000	1.1
  +++ RollingPolicy.java	5 May 2003 20:42:57 -0000	1.2
  @@ -72,5 +72,5 @@
     /**
      * Get the new log file where logging should go.
      * */  
  -  public File getLogFile(String filename);
  +  public File getActiveLogFile(String filename);
   }
  
  
  
  1.2       +44 -7     jakarta-log4j/src/java/org/apache/log4j/rolling/SlidingWindowRollingPolicy.java
  
  Index: SlidingWindowRollingPolicy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/rolling/SlidingWindowRollingPolicy.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SlidingWindowRollingPolicy.java	23 Apr 2003 21:28:57 -0000	1.1
  +++ SlidingWindowRollingPolicy.java	5 May 2003 20:42:57 -0000	1.2
  @@ -49,26 +49,33 @@
   
   package org.apache.log4j.rolling;
   
  -import java.io.File;
  -
   import org.apache.log4j.Logger;
   
  +import java.io.File;
  +
   
   /**
  + * The SlidingWindowRollingPolicy rolls over files
    *
    * @author Ceki G&uuml;lc&uuml;
    * @since 1.3
    * */
   public class SlidingWindowRollingPolicy implements RollingPolicy {
  - 
  -  static Logger logger = Logger.getLogger(SlidingWindowRollingPolicy.class); 
  +  static Logger logger = Logger.getLogger(SlidingWindowRollingPolicy.class);
     int maxIndex;
  +  int minIndex;
  +  String fileNamePattern;
  +  String activeFileName;
  +
  +  public SlidingWindowRollingPolicy() {
  +    minIndex = 1;
  +  }
   
     public void rollover(File file) {
       // If maxIndex <= 0, then there is no file renaming to be done.
  -  
       if (maxIndex > 0) {
  -        String filename = file.getName();
  +      String filename = file.getName();
  +
         // Delete the oldest file, to keep Windows happy.
         file = new File(filename + '.' + maxIndex);
   
  @@ -77,6 +84,7 @@
         }
   
         // Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2}
  +
         /* for (int i = maxIndex - 1; i >= 1; i--) {
            file = new File(filename + "." + i);
   
  @@ -95,7 +103,36 @@
       }
     }
   
  -  public File getLogFile(String old) {
  +  /**
  +   * Return the file name for the i-th file in the sliding window according
  +   * to the file name pattern.
  +   * */
  +  protected String getFilenameInWindow(int i) {
  +    return fileNamePattern + i;
  +  }
  +
  +  public File getActiveLogFile(String old) {
       return new File(old);
  +  }
  +
  +  public String getActiveFileName() {
  +    return activeFileName;
  +  }
  +
  + 
  +  public int getMaxIndex() {
  +    return maxIndex;
  +  }
  +
  +  public int getMinIndex() {
  +    return minIndex;
  +  }
  +
  +  public void setMaxIndex(int maxIndex) {
  +    this.maxIndex = maxIndex;
  +  }
  +
  +  public void setMinIndex(int minIndex) {
  +    this.minIndex = minIndex;
     }
   }
  
  
  
  1.4       +0 -1      jakarta-log4j/src/java/org/apache/log4j/spi/RendererSupport.java
  
  Index: RendererSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/RendererSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RendererSupport.java	18 Mar 2003 21:41:33 -0000	1.3
  +++ RendererSupport.java	5 May 2003 20:42:57 -0000	1.4
  @@ -49,7 +49,6 @@
   
   package org.apache.log4j.spi;
   
  -import org.apache.log4j.*;
   import org.apache.log4j.or.ObjectRenderer;
   import org.apache.log4j.or.RendererMap;
   
  
  
  
  1.4       +1 -1      jakarta-log4j/src/java/org/apache/log4j/test/AsyncAppenderTest.java
  
  Index: AsyncAppenderTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/AsyncAppenderTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AsyncAppenderTest.java	18 Mar 2003 13:33:30 -0000	1.3
  +++ AsyncAppenderTest.java	5 May 2003 20:42:57 -0000	1.4
  @@ -99,7 +99,7 @@
       }
   
       try {
  -      Thread.currentThread().sleep(delayBeforeClose);
  +      Thread.sleep(delayBeforeClose);
       } catch (Exception e) {
       }
   
  
  
  
  1.3       +1 -1      jakarta-log4j/src/java/org/apache/log4j/test/DRFATest.java
  
  Index: DRFATest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/DRFATest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DRFATest.java	24 Apr 2002 01:16:11 -0000	1.2
  +++ DRFATest.java	5 May 2003 20:42:57 -0000	1.3
  @@ -83,7 +83,7 @@
     static
     void delay(int amount) {
       try {
  -      Thread.currentThread().sleep(amount);
  +      Thread.sleep(amount);
       }
       catch(Exception e) {}
     }
  
  
  
  1.4       +1 -1      jakarta-log4j/src/java/org/apache/log4j/test/DelayedLoop.java
  
  Index: DelayedLoop.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/DelayedLoop.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DelayedLoop.java	14 Dec 2000 21:08:13 -0000	1.3
  +++ DelayedLoop.java	5 May 2003 20:42:57 -0000	1.4
  @@ -59,7 +59,7 @@
       while(true) {
         cat.debug("MSG "+i++);
         try {
  -	Thread.currentThread().sleep(1000);
  +	      Thread.sleep(1000);
         } catch(Exception e) {}
       }
     }
  
  
  
  1.4       +1 -1      jakarta-log4j/src/java/org/apache/log4j/test/Finalize.java
  
  Index: Finalize.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/Finalize.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Finalize.java	24 Apr 2002 01:16:11 -0000	1.3
  +++ Finalize.java	5 May 2003 20:42:58 -0000	1.4
  @@ -80,7 +80,7 @@
     static
     void delay(int amount) {
       try {
  -      Thread.currentThread().sleep(amount);
  +      Thread.sleep(amount);
       }
       catch(Exception e) {}
     }
  
  
  
  1.10      +1 -1      jakarta-log4j/src/java/org/apache/log4j/test/Shallow.java
  
  Index: Shallow.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/Shallow.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Shallow.java	18 Mar 2003 13:33:30 -0000	1.9
  +++ Shallow.java	5 May 2003 20:42:58 -0000	1.10
  @@ -93,7 +93,7 @@
     static
     void delay(int amount) {
       try {
  -      Thread.currentThread().sleep(amount);
  +      Thread.sleep(amount);
       }
       catch(Exception e) {}
     }
  
  
  
  1.5       +1 -1      jakarta-log4j/src/java/org/apache/log4j/test/StressAsyncAppender.java
  
  Index: StressAsyncAppender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/StressAsyncAppender.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StressAsyncAppender.java	24 Apr 2002 01:16:11 -0000	1.4
  +++ StressAsyncAppender.java	5 May 2003 20:42:58 -0000	1.5
  @@ -148,7 +148,7 @@
     public
     void delay(long millis) {
       try {
  -      Thread.currentThread().sleep(millis);
  +      Thread.sleep(millis);
       } catch(Exception e) {}
     }
   
  
  
  
  1.13      +0 -1      jakarta-log4j/src/java/org/apache/log4j/varia/ExternallyRolledFileAppender.java
  
  Index: ExternallyRolledFileAppender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/varia/ExternallyRolledFileAppender.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ExternallyRolledFileAppender.java	20 May 2002 09:52:58 -0000	1.12
  +++ ExternallyRolledFileAppender.java	5 May 2003 20:42:58 -0000	1.13
  @@ -12,7 +12,6 @@
   import java.net.ServerSocket;
   import org.apache.log4j.helpers.LogLog;
   import org.apache.log4j.RollingFileAppender;
  -import org.apache.log4j.helpers.LogLog;
   
   /**
      This appender listens on a socket on the port specified by the
  
  
  
  1.4       +0 -2      jakarta-log4j/src/java/org/apache/log4j/varia/LevelRangeFilter.java
  
  Index: LevelRangeFilter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/varia/LevelRangeFilter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LevelRangeFilter.java	9 Oct 2002 22:50:06 -0000	1.3
  +++ LevelRangeFilter.java	5 May 2003 20:42:58 -0000	1.4
  @@ -10,8 +10,6 @@
   import org.apache.log4j.Level;
   import org.apache.log4j.spi.Filter;
   import org.apache.log4j.spi.LoggingEvent;
  -import org.apache.log4j.helpers.LogLog;
  -import org.apache.log4j.helpers.OptionConverter;
   
   /**
      This is a very simple filter based on level matching, which can be
  
  
  
  1.3       +1 -5      jakarta-log4j/src/java/org/apache/log4j/varia/NullAppender.java
  
  Index: NullAppender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/varia/NullAppender.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NullAppender.java	9 Oct 2002 22:50:06 -0000	1.2
  +++ NullAppender.java	5 May 2003 20:42:58 -0000	1.3
  @@ -7,12 +7,8 @@
   
   package org.apache.log4j.varia;
   
  -import org.apache.log4j.Appender;
  -import org.apache.log4j.Layout;
  -import org.apache.log4j.spi.OptionHandler;
  +
   import org.apache.log4j.spi.LoggingEvent;
  -import org.apache.log4j.spi.ErrorHandler;
  -import org.apache.log4j.spi.Filter;
   import org.apache.log4j.AppenderSkeleton;
   
   /**
  
  
  
  1.9       +0 -1      jakarta-log4j/src/java/org/apache/log4j/varia/StringMatchFilter.java
  
  Index: StringMatchFilter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/varia/StringMatchFilter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- StringMatchFilter.java	20 May 2002 12:20:58 -0000	1.8
  +++ StringMatchFilter.java	5 May 2003 20:42:58 -0000	1.9
  @@ -10,7 +10,6 @@
   
   import org.apache.log4j.spi.Filter;
   import org.apache.log4j.spi.LoggingEvent;
  -import org.apache.log4j.helpers.OptionConverter;
   
   /**
      This is a very simple filter based on string matching.
  
  
  
  1.55      +0 -1      jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java
  
  Index: DOMConfigurator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- DOMConfigurator.java	3 Mar 2003 15:24:03 -0000	1.54
  +++ DOMConfigurator.java	5 May 2003 20:42:58 -0000	1.55
  @@ -26,7 +26,6 @@
   import java.io.InputStream;
   import java.io.Reader;
   import java.io.IOException;
  -import java.net.URL;
   import javax.xml.parsers.DocumentBuilderFactory;
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.FactoryConfigurationError;
  
  
  
  1.3       +0 -4      jakarta-log4j/src/java/org/apache/log4j/xml/Log4jEntityResolver.java
  
  Index: Log4jEntityResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/Log4jEntityResolver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Log4jEntityResolver.java	3 Mar 2003 19:02:05 -0000	1.2
  +++ Log4jEntityResolver.java	5 May 2003 20:42:58 -0000	1.3
  @@ -8,10 +8,6 @@
   package org.apache.log4j.xml;
   
   import java.io.InputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.ByteArrayInputStream;
  -import java.io.IOException;
  -
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
   
  
  
  
  1.21      +0 -2      jakarta-log4j/src/java/org/apache/log4j/xml/XMLLayout.java
  
  Index: XMLLayout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/XMLLayout.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- XMLLayout.java	26 Mar 2003 06:25:55 -0000	1.20
  +++ XMLLayout.java	5 May 2003 20:42:58 -0000	1.21
  @@ -12,8 +12,6 @@
   import org.apache.log4j.Layout;
   import org.apache.log4j.spi.LoggingEvent;
   import org.apache.log4j.spi.LocationInfo;
  -import org.apache.log4j.helpers.OptionConverter;
  -import org.apache.log4j.helpers.DateLayout;
   import org.apache.log4j.helpers.Transform;
   import java.util.Set;
   import java.util.Iterator;
  
  
  
  1.5       +0 -1      jakarta-log4j/src/java/org/apache/log4j/xml/examples/XMLSample.java
  
  Index: XMLSample.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/examples/XMLSample.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLSample.java	24 Apr 2002 01:16:11 -0000	1.4
  +++ XMLSample.java	5 May 2003 20:42:58 -0000	1.5
  @@ -3,7 +3,6 @@
   
   import org.apache.log4j.xml.DOMConfigurator;
   import org.apache.log4j.Category;
  -import java.net.*;
   
   /**
   
  
  
  

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


Mime
View raw message