You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2012/11/03 02:44:00 UTC
svn commit: r1405254 - in /logging/log4j/log4j2/trunk/core/src: main/java/org/apache/logging/log4j/core/appender/ test/java/org/apache/logging/log4j/test/appender/

Author: ggregory
Date: Sat Nov  3 01:43:59 2012
New Revision: 1405254

URL: http://svn.apache.org/viewvc?rev=1405254&view=rev
Log:
Rename OutputStreamAppender to AbstractOutputStreamAppender.

Added:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
      - copied, changed from r1405133, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
Removed:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java

Copied: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java (from r1405133, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java&r1=1405133&r2=1405254&rev=1405254&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java Sat Nov  3 01:43:59 2012
@@ -27,7 +27,7 @@ import java.util.concurrent.locks.Reentr
 /**
  * Writes the byte output stream. The stream will already have been encoded.
  */
-public abstract class OutputStreamAppender extends AbstractAppender {
+public abstract class AbstractOutputStreamAppender extends AbstractAppender {
 
     /**
      * Immediate flush means that the underlying writer or output stream
@@ -54,7 +54,7 @@ public abstract class OutputStreamAppend
      * @param layout The layout to format the message.
      * @param manager The OutputStreamManager.
      */
-    protected OutputStreamAppender(String name, Layout layout, Filter filter, boolean handleException,
+    protected AbstractOutputStreamAppender(String name, Layout layout, Filter filter, boolean handleException,
                                 boolean immediateFlush, OutputStreamManager manager) {
         super(name, filter, layout, handleException);
         if (layout != null) {
@@ -102,7 +102,7 @@ public abstract class OutputStreamAppend
     /**
      * Actual writing occurs here.
      * <p/>
-     * <p>Most subclasses of <code>OutputStreamAppender</code> will need to
+     * <p>Most subclasses of <code>AbstractOutputStreamAppender</code> will need to
      * override this method.
      * @param event The LogEvent.
      */

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java?rev=1405254&r1=1405253&r2=1405254&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java Sat Nov  3 01:43:59 2012
@@ -40,7 +40,7 @@ import java.lang.reflect.Constructor;
  * default. OTOH, a Writer cannot print byte streams.
  */
 @Plugin(name = "Console", type = "Core", elementType = "appender", printObject = true)
-public final class ConsoleAppender extends OutputStreamAppender {
+public final class ConsoleAppender extends AbstractOutputStreamAppender {
 
     private static ConsoleManagerFactory factory = new ConsoleManagerFactory();
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java?rev=1405254&r1=1405253&r2=1405254&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java Sat Nov  3 01:43:59 2012
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.lay
  * File Appender.
  */
 @Plugin(name = "File", type = "Core", elementType = "appender", printObject = true)
-public final class FileAppender extends OutputStreamAppender {
+public final class FileAppender extends AbstractOutputStreamAppender {
 
     private final String fileName;
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java?rev=1405254&r1=1405253&r2=1405254&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java Sat Nov  3 01:43:59 2012
@@ -35,7 +35,7 @@ import org.apache.logging.log4j.core.lay
  * An appender that writes to files andd can roll over at intervals.
  */
 @Plugin(name = "RollingFile", type = "Core", elementType = "appender", printObject = true)
-public final class RollingFileAppender extends OutputStreamAppender {
+public final class RollingFileAppender extends AbstractOutputStreamAppender {
 
     private final String fileName;
     private final String filePattern;

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java?rev=1405254&r1=1405253&r2=1405254&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java Sat Nov  3 01:43:59 2012
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.net
  * An Appender that delivers events over socket connections. Supports both TCP and UDP.
  */
 @Plugin(name = "Socket", type = "Core", elementType = "appender", printObject = true)
-public class SocketAppender extends OutputStreamAppender {
+public class SocketAppender extends AbstractOutputStreamAppender {
 
 
     protected SocketAppender(String name, Layout layout, Filter filter, AbstractSocketManager manager,

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java?rev=1405254&r1=1405253&r2=1405254&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java Sat Nov  3 01:43:59 2012
@@ -17,7 +17,7 @@
 package org.apache.logging.log4j.test.appender;
 
 import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.appender.OutputStreamAppender;
+import org.apache.logging.log4j.core.appender.AbstractOutputStreamAppender;
 import org.apache.logging.log4j.core.appender.OutputStreamManager;
 import org.apache.logging.log4j.core.filter.CompositeFilter;
 
@@ -26,7 +26,7 @@ import java.io.ByteArrayOutputStream;
 /**
  *
  */
-public class InMemoryAppender extends OutputStreamAppender {
+public class InMemoryAppender extends AbstractOutputStreamAppender {
 
     public InMemoryAppender(String name, Layout layout, CompositeFilter filters, boolean handleException) {
         super(name, layout, filters, handleException, true, new InMemoryManager(name));