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/10/09 19:20:27 UTC
svn commit: r1396126 - in /logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender: AbstractFlumeManager.java FlumeAppender.java FlumeAvroManager.java FlumeEmbeddedManager.java FlumeManager.java

Author: ggregory
Date: Tue Oct  9 17:20:27 2012
New Revision: 1396126

URL: http://svn.apache.org/viewvc?rev=1396126&view=rev
Log:
Rename FlumeManager to AbstractFlumeManager; note that this class declares an abstract method.

Added:
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java
      - copied, changed from r1396106, logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeManager.java
Removed:
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeManager.java
Modified:
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java

Copied: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java (from r1396106, logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeManager.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java?p2=logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java&p1=logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeManager.java&r1=1396106&r2=1396126&rev=1396126&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeManager.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java Tue Oct  9 17:20:27 2012
@@ -21,9 +21,9 @@ import org.apache.logging.log4j.core.app
 /**
  *
  */
-public abstract class FlumeManager extends AbstractManager {
+public abstract class AbstractFlumeManager extends AbstractManager {
 
-    public FlumeManager(String name) {
+    public AbstractFlumeManager(String name) {
         super(name);
     }
 

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java?rev=1396126&r1=1396125&r2=1396126&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java Tue Oct  9 17:20:27 2012
@@ -33,7 +33,7 @@ import org.apache.logging.log4j.core.lay
 @Plugin(name = "Flume", type = "Core", elementType = "appender", printObject = true)
 public final class FlumeAppender extends AbstractAppender implements FlumeEventFactory {
 
-    private FlumeManager manager;
+    private AbstractFlumeManager manager;
 
     private final String mdcIncludes;
     private final String mdcExcludes;
@@ -54,7 +54,7 @@ public final class FlumeAppender extends
     private FlumeAppender(String name, Filter filter, Layout layout, boolean handleException,
                           String includes, String excludes, String required, String mdcPrefix,
                           String eventPrefix, boolean compress, int delay, int retries,
-                          FlumeEventFactory factory, FlumeManager manager) {
+                          FlumeEventFactory factory, AbstractFlumeManager manager) {
         super(name, filter, layout, handleException);
         this.manager = manager;
         this.mdcIncludes = includes;
@@ -161,7 +161,7 @@ public final class FlumeAppender extends
             return null;
         }
 
-        FlumeManager manager;
+        AbstractFlumeManager manager;
 
         if (embed) {
             manager = FlumeEmbeddedManager.getManager(name, agents, properties, batchCount, dataDir);

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java?rev=1396126&r1=1396125&r2=1396126&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java Tue Oct  9 17:20:27 2012
@@ -37,7 +37,7 @@ import java.util.Map;
 /**
  * Manager for FlumeAvroAppenders.
  */
-public class FlumeAvroManager extends FlumeManager {
+public class FlumeAvroManager extends AbstractFlumeManager {
 
     /**
       The default reconnection delay (500 milliseconds or .5 seconds).

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java?rev=1396126&r1=1396125&r2=1396126&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java Tue Oct  9 17:20:27 2012
@@ -31,7 +31,7 @@ import java.util.Properties;
 /**
  *
  */
-public class FlumeEmbeddedManager extends FlumeManager {
+public class FlumeEmbeddedManager extends AbstractFlumeManager {
 
     private static ManagerFactory factory = new FlumeManagerFactory();