You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2005/02/25 14:44:37 UTC

cvs commit: logging-log4j/src/java/org/apache/log4j/multiplex MultiplexAppender.java

ceki        2005/02/25 05:44:37

  Modified:    src/java/org/apache/log4j WriterAppender.java
                        AsyncAppender.java
               src/java/org/apache/log4j/varia ListModelAppender.java
                        ListAppender.java NullAppender.java
               src/java/org/apache/log4j/db DBAppender.java
               src/java/org/apache/log4j/net SocketHubAppender.java
                        TelnetAppender.java SocketAppender.java
                        SMTPAppender.java JMSAppender.java UDPAppender.java
                        SyslogAppender.java MulticastAppender.java
               src/java/org/apache/log4j/multiplex MultiplexAppender.java
  Log:
  We already have a strategy ensuring backward compatibility, no need to make things even more complicated.
  
  Revision  Changes    Path
  1.33      +0 -2      logging-log4j/src/java/org/apache/log4j/WriterAppender.java
  
  Index: WriterAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/WriterAppender.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- WriterAppender.java	24 Feb 2005 22:56:20 -0000	1.32
  +++ WriterAppender.java	25 Feb 2005 13:44:36 -0000	1.33
  @@ -67,7 +67,6 @@
      * The default constructor does nothing.  
      * */
     public WriterAppender() {
  -     super(false);
     }
   
     /**
  @@ -92,7 +91,6 @@
      * future log4j versions 
      * */
     public WriterAppender(Layout layout, Writer writer) {
  -    super(false);
       this.layout = layout;
       this.setWriter(writer);
       this.activate();
  
  
  
  1.46      +1 -1      logging-log4j/src/java/org/apache/log4j/AsyncAppender.java
  
  Index: AsyncAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/AsyncAppender.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- AsyncAppender.java	24 Feb 2005 22:56:20 -0000	1.45
  +++ AsyncAppender.java	25 Feb 2005 13:44:36 -0000	1.46
  @@ -68,10 +68,10 @@
     public AsyncAppender() {
       // Note: The dispatcher code assumes that the aai is set once and
       // for all.
  -    super(true);
       aai = new AppenderAttachableImpl();
       dispatcher = new Dispatcher(bf, this);
       dispatcher.start();
  +    super.activate();
     }
     
     public void addAppender(Appender newAppender) {
  
  
  
  1.5       +0 -7      logging-log4j/src/java/org/apache/log4j/varia/ListModelAppender.java
  
  Index: ListModelAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/varia/ListModelAppender.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ListModelAppender.java	24 Feb 2005 22:56:21 -0000	1.4
  +++ ListModelAppender.java	25 Feb 2005 13:44:36 -0000	1.5
  @@ -32,13 +32,6 @@
    */
   public final class ListModelAppender extends AppenderSkeleton {
     private final DefaultListModel model = new DefaultListModel();
  -  
  -  /**
  -   *   Constructs a ListModelAppender.
  -   */
  -  public ListModelAppender() {
  -     super(true);
  -  }
   
     /**
      * Returns a reference to the ListModel that contains all the LoggingEvents
  
  
  
  1.9       +0 -7      logging-log4j/src/java/org/apache/log4j/varia/ListAppender.java
  
  Index: ListAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/varia/ListAppender.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ListAppender.java	24 Feb 2005 22:56:21 -0000	1.8
  +++ ListAppender.java	25 Feb 2005 13:44:36 -0000	1.9
  @@ -40,13 +40,6 @@
     private List list = new ArrayList();
   
     /**
  -   *   Constructs a new ListAppender.
  -   */
  -  public ListAppender() {
  -     super(true);
  -  }
  -  
  -  /**
      * Returns a writeable, BUT cloned List of all the LoggingEvents that are contained
      * in the internal model.  You are free to modify this list without
     * worry of synchronization, but note that any modifications to the returned list
  
  
  
  1.8       +6 -1      logging-log4j/src/java/org/apache/log4j/varia/NullAppender.java
  
  Index: NullAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/varia/NullAppender.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- NullAppender.java	24 Feb 2005 22:56:21 -0000	1.7
  +++ NullAppender.java	25 Feb 2005 13:44:36 -0000	1.8
  @@ -21,7 +21,12 @@
     private static NullAppender instance = new NullAppender();
   
     public NullAppender() {
  -     super(true);
  +  }
  +
  +  /** 
  +   * There are no options to acticate.
  +   * */
  +  public void activateOptions() {
     }
   
     /**
  
  
  
  1.20      +0 -1      logging-log4j/src/java/org/apache/log4j/db/DBAppender.java
  
  Index: DBAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/db/DBAppender.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- DBAppender.java	24 Feb 2005 22:56:21 -0000	1.19
  +++ DBAppender.java	25 Feb 2005 13:44:36 -0000	1.20
  @@ -143,7 +143,6 @@
     boolean locationInfo = false;
   
     public DBAppender() {
  -     super(false);
     }
   
     public void activate() {
  
  
  
  1.16      +1 -4      logging-log4j/src/java/org/apache/log4j/net/SocketHubAppender.java
  
  Index: SocketHubAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketHubAppender.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SocketHubAppender.java	24 Feb 2005 22:56:21 -0000	1.15
  +++ SocketHubAppender.java	25 Feb 2005 13:44:36 -0000	1.16
  @@ -118,7 +118,6 @@
     private CyclicBuffer buffer = null;
   
     public SocketHubAppender() {
  -     super(false);
     }
   
     /**
  @@ -130,10 +129,8 @@
   
     /**
        Set up the socket server on the specified port.  */
  -  public void activate() {
  +  public void activateOptions() {
       startServer();
  -    
  -    super.activate();
     }
   
     /**
  
  
  
  1.16      +0 -7      logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java
  
  Index: TelnetAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- TelnetAppender.java	24 Feb 2005 22:56:21 -0000	1.15
  +++ TelnetAppender.java	25 Feb 2005 13:44:36 -0000	1.16
  @@ -59,13 +59,6 @@
     private int port = 23;
   
     /**
  -   *  Creates a new TelnetAppender.
  -   */
  -  public TelnetAppender() {
  -     super(false);
  -  }
  -  
  -  /**
         This appender requires a layout to format the text to the
         attached client(s). */
     public boolean requiresLayout() {
  
  
  
  1.29      +0 -1      logging-log4j/src/java/org/apache/log4j/net/SocketAppender.java
  
  Index: SocketAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketAppender.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- SocketAppender.java	24 Feb 2005 22:56:21 -0000	1.28
  +++ SocketAppender.java	25 Feb 2005 13:44:36 -0000	1.29
  @@ -123,7 +123,6 @@
     String application;
   
     public SocketAppender() {
  -      super(false);
     }
   
     /**
  
  
  
  1.49      +0 -1      logging-log4j/src/java/org/apache/log4j/net/SMTPAppender.java
  
  Index: SMTPAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/SMTPAppender.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- SMTPAppender.java	24 Feb 2005 22:56:21 -0000	1.48
  +++ SMTPAppender.java	25 Feb 2005 13:44:36 -0000	1.49
  @@ -100,7 +100,6 @@
        Use <code>evaluator</code> passed as parameter as the {@link
        TriggeringEventEvaluator} for this SMTPAppender.  */
     public SMTPAppender(TriggeringEventEvaluator evaluator) {
  -    super(false);
       this.evaluator = evaluator;
     }
   
  
  
  
  1.22      +0 -1      logging-log4j/src/java/org/apache/log4j/net/JMSAppender.java
  
  Index: JMSAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/JMSAppender.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- JMSAppender.java	24 Feb 2005 22:56:21 -0000	1.21
  +++ JMSAppender.java	25 Feb 2005 13:44:36 -0000	1.22
  @@ -120,7 +120,6 @@
     int successiveFailureCount = 0;
     
     public JMSAppender() {
  -      super(false);
     }
   
     /**
  
  
  
  1.14      +0 -1      logging-log4j/src/java/org/apache/log4j/net/UDPAppender.java
  
  Index: UDPAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/UDPAppender.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- UDPAppender.java	24 Feb 2005 22:56:21 -0000	1.13
  +++ UDPAppender.java	25 Feb 2005 13:44:36 -0000	1.14
  @@ -73,7 +73,6 @@
     boolean inError = false;
     
     public UDPAppender() {
  -     super(false);
     }
   
     /**
  
  
  
  1.22      +0 -1      logging-log4j/src/java/org/apache/log4j/net/SyslogAppender.java
  
  Index: SyslogAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/SyslogAppender.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- SyslogAppender.java	24 Feb 2005 22:56:21 -0000	1.21
  +++ SyslogAppender.java	25 Feb 2005 13:44:37 -0000	1.22
  @@ -70,7 +70,6 @@
     Layout layout;
     
     public SyslogAppender() {
  -      super(false);
     }
   
     /**
  
  
  
  1.13      +0 -1      logging-log4j/src/java/org/apache/log4j/net/MulticastAppender.java
  
  Index: MulticastAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/MulticastAppender.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MulticastAppender.java	24 Feb 2005 22:56:21 -0000	1.12
  +++ MulticastAppender.java	25 Feb 2005 13:44:37 -0000	1.13
  @@ -71,7 +71,6 @@
     private String encoding;
     
     public MulticastAppender() {
  -     super(false);
     }
   
     /**
  
  
  
  1.4       +0 -4      logging-log4j/src/java/org/apache/log4j/multiplex/MultiplexAppender.java
  
  Index: MultiplexAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/multiplex/MultiplexAppender.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MultiplexAppender.java	24 Feb 2005 22:56:21 -0000	1.3
  +++ MultiplexAppender.java	25 Feb 2005 13:44:37 -0000	1.4
  @@ -16,10 +16,6 @@
   
   	private MultiplexSelector selector;
   
  -    public MultiplexAppender() {
  -       super(false);
  -    }
  -
   	/*
   	 * (non-Javadoc)
   	 * 
  
  
  

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