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 07:52:18 UTC
svn commit: r1405296 - in /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core: appender/ config/ filter/

Author: ggregory
Date: Sat Nov  3 06:52:17 2012
New Revision: 1405296

URL: http://svn.apache.org/viewvc?rev=1405296&view=rev
Log:
Rename class Filterable to AbstractFilterable  and make it abstract.

Added:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
      - copied, changed from r1405133, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
Removed:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java?rev=1405296&r1=1405295&r2=1405296&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java Sat Nov  3 06:52:17 2012
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.Fil
 import org.apache.logging.log4j.core.LifeCycle;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.filter.Filterable;
+import org.apache.logging.log4j.core.filter.AbstractFilterable;
 import org.apache.logging.log4j.status.StatusLogger;
 import org.apache.logging.log4j.Logger;
 
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.Logger;
  * Abstract base class for Appenders. Although Appenders do not have to extend this class, doing so
  * will simplify their implementation.
  */
-public abstract class AbstractAppender<T extends Serializable> extends Filterable implements Appender<T>, LifeCycle {
+public abstract class AbstractAppender<T extends Serializable> extends AbstractFilterable implements Appender<T>, LifeCycle {
     /**
      * Allow subclasses access to the status logger without creating another instance.
      */

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java?rev=1405296&r1=1405295&r2=1405296&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java Sat Nov  3 06:52:17 2012
@@ -21,13 +21,13 @@ import org.apache.logging.log4j.core.App
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.appender.AppenderRuntimeException;
-import org.apache.logging.log4j.core.filter.Filterable;
+import org.apache.logging.log4j.core.filter.AbstractFilterable;
 import org.apache.logging.log4j.core.filter.Filtering;
 
 /**
  * Wraps an {@link Appender} with details an appender implementation shouldn't need to know about.
  */
-public class AppenderControl extends Filterable {
+public class AppenderControl extends AbstractFilterable {
 
     private final ThreadLocal<AppenderControl> recursive = new ThreadLocal<AppenderControl>();
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java?rev=1405296&r1=1405295&r2=1405296&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java Sat Nov  3 06:52:17 2012
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.con
 import org.apache.logging.log4j.core.config.plugins.PluginNode;
 import org.apache.logging.log4j.core.config.plugins.PluginType;
 import org.apache.logging.log4j.core.config.plugins.PluginValue;
-import org.apache.logging.log4j.core.filter.Filterable;
+import org.apache.logging.log4j.core.filter.AbstractFilterable;
 import org.apache.logging.log4j.core.helpers.NameUtil;
 import org.apache.logging.log4j.core.lookup.Interpolator;
 import org.apache.logging.log4j.core.lookup.StrLookup;
@@ -50,7 +50,7 @@ import java.util.concurrent.CopyOnWriteA
 /**
  * The Base Configuration. Many configuration implementations will extend this class.
  */
-public class BaseConfiguration extends Filterable implements Configuration {
+public class BaseConfiguration extends AbstractFilterable implements Configuration {
     /**
      * Allow subclasses access to the status logger without creating another instance.
      */

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java?rev=1405296&r1=1405295&r2=1405296&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java Sat Nov  3 06:52:17 2012
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.App
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.LifeCycle;
 import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
-import org.apache.logging.log4j.core.filter.Filterable;
+import org.apache.logging.log4j.core.filter.AbstractFilterable;
 import org.apache.logging.log4j.core.impl.Log4jLogEvent;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.impl.LogEventFactory;
@@ -49,7 +49,7 @@ import java.util.concurrent.atomic.Atomi
  * Logger object that is created via configuration.
  */
 @Plugin(name = "logger", type = "Core", printObject = true)
-public class LoggerConfig extends Filterable implements LogEventFactory {
+public class LoggerConfig extends AbstractFilterable implements LogEventFactory {
 
     private static final Logger LOGGER = StatusLogger.getLogger();
     private static final int MAX_RETRIES = 3;

Copied: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java (from r1405133, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java&r1=1405133&r2=1405296&rev=1405296&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java Sat Nov  3 06:52:17 2012
@@ -25,15 +25,15 @@ import java.util.Iterator;
 /**
  * Enhances a Class by allowing it to contain Filters.
  */
-public class Filterable implements Filtering {
+public abstract class AbstractFilterable implements Filtering {
 
     private volatile Filter filter;
 
-    protected Filterable(Filter filter) {
+    protected AbstractFilterable(Filter filter) {
         this.filter = filter;
     }
 
-    protected Filterable() {
+    protected AbstractFilterable() {
     }
 
     /**