From commits-return-1578-apmail-logging-commits-archive=logging.apache.org@logging.apache.org Sat Nov 3 12:53:47 2012 Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 75B80DDBA for ; Sat, 3 Nov 2012 12:53:47 +0000 (UTC) Received: (qmail 44192 invoked by uid 500); 3 Nov 2012 12:53:45 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 44106 invoked by uid 500); 3 Nov 2012 12:53:43 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 44047 invoked by uid 99); 3 Nov 2012 12:53:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Nov 2012 12:53:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Nov 2012 12:53:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8B95C23888E7; Sat, 3 Nov 2012 12:53:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1405327 - in /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core: config/AppenderControl.java config/Configuration.java filter/AbstractFilterable.java filter/Filterable.java filter/Filtering.java Date: Sat, 03 Nov 2012 12:53:16 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121103125316.8B95C23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Sat Nov 3 12:53:15 2012 New Revision: 1405327 URL: http://svn.apache.org/viewvc?rev=1405327&view=rev Log: Rename interface Filtering to Filterable. Added: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java - copied, changed from r1405133, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filtering.java Removed: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filtering.java Modified: 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/Configuration.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java 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=1405327&r1=1405326&r2=1405327&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 12:53:15 2012 @@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.Fil import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AppenderRuntimeException; import org.apache.logging.log4j.core.filter.AbstractFilterable; -import org.apache.logging.log4j.core.filter.Filtering; +import org.apache.logging.log4j.core.filter.Filterable; /** * Wraps an {@link Appender} with details an appender implementation shouldn't need to know about. @@ -90,7 +90,7 @@ public class AppenderControl extends Abs } } - if (appender instanceof Filtering && ((Filtering) appender).isFiltered(event)) { + if (appender instanceof Filterable && ((Filterable) appender).isFiltered(event)) { return; } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java?rev=1405327&r1=1405326&r2=1405327&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java Sat Nov 3 12:53:15 2012 @@ -20,7 +20,7 @@ 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.Logger; -import org.apache.logging.log4j.core.filter.Filtering; +import org.apache.logging.log4j.core.filter.Filterable; import org.apache.logging.log4j.core.lookup.StrSubstitutor; import java.util.Map; @@ -28,7 +28,7 @@ import java.util.Map; /** * Interface that must be implemented to create a configuration. */ -public interface Configuration extends Filtering { +public interface Configuration extends Filterable { /** * Returns the configuration name. Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java?rev=1405327&r1=1405326&r2=1405327&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java Sat Nov 3 12:53:15 2012 @@ -25,7 +25,7 @@ import java.util.Iterator; /** * Enhances a Class by allowing it to contain Filters. */ -public abstract class AbstractFilterable implements Filtering { +public abstract class AbstractFilterable implements Filterable { private volatile Filter filter; Copied: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java (from r1405133, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filtering.java) URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filtering.java&r1=1405133&r2=1405327&rev=1405327&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filtering.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java Sat Nov 3 12:53:15 2012 @@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.Log /** * Interface implemented by Classes that allow filtering to occur. */ -public interface Filtering { +public interface Filterable { /** * Adds a new Filter. If a Filter already exists it is converted to a CompositeFilter.