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:06:21 UTC
svn commit: r1396114 - in /logging/log4j/log4j2/trunk/core/src:
main/java/org/apache/logging/log4j/core/filter/
test/java/org/apache/logging/log4j/core/net/
Author: ggregory
Date: Tue Oct 9 17:06:20 2012
New Revision: 1396114
URL: http://svn.apache.org/viewvc?rev=1396114&view=rev
Log:
Rename FilterBase to AbstractFilter.
Added:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
- copied, changed from r1396106, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/FilterBase.java
Removed:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/FilterBase.java
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java
Copied: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java (from r1396106, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/FilterBase.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/FilterBase.java&r1=1396106&r2=1396114&rev=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/FilterBase.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java Tue Oct 9 17:06:20 2012
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.message.
* which case it will only implement the required method(s). The rest will default to return NEUTRAL.
*
*/
-public abstract class FilterBase implements Filter, Lifecycle {
+public abstract class AbstractFilter implements Filter, Lifecycle {
/**
* Allow subclasses access to the status logger without creating another instance.
*/
@@ -52,7 +52,7 @@ public abstract class FilterBase impleme
/**
* The default constructor.
*/
- protected FilterBase() {
+ protected AbstractFilter() {
this(null, null);
}
@@ -61,7 +61,7 @@ public abstract class FilterBase impleme
* @param onMatch The result to return when a match occurs.
* @param onMismatch The result to return when a match dos not occur.
*/
- protected FilterBase(Result onMatch, Result onMismatch) {
+ protected AbstractFilter(Result onMatch, Result onMismatch) {
this.onMatch = onMatch == null ? Result.NEUTRAL : onMatch;
this.onMismatch = onMismatch == null ? Result.DENY : onMismatch;
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java?rev=1396114&r1=1396113&r2=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java Tue Oct 9 17:06:20 2012
@@ -53,7 +53,7 @@ import java.util.concurrent.TimeUnit;
*/
@Plugin(name = "BurstFilter", type = "Core", elementType = "filter", printObject = true)
-public final class BurstFilter extends FilterBase {
+public final class BurstFilter extends AbstractFilter {
private static final long NANOS_IN_SECONDS = 1000000000;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java?rev=1396114&r1=1396113&r2=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java Tue Oct 9 17:06:20 2012
@@ -35,7 +35,7 @@ import java.util.Map;
* Compare against a log level that is associated with an MDC value.
*/
@Plugin(name = "DynamicThresholdFilter", type = "Core", elementType = "filter", printObject = true)
-public final class DynamicThresholdFilter extends FilterBase {
+public final class DynamicThresholdFilter extends AbstractFilter {
private Map<String, Level> levelMap = new HashMap<String, Level>();
private Level defaultThreshold = Level.ERROR;
private String key;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java?rev=1396114&r1=1396113&r2=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java Tue Oct 9 17:06:20 2012
@@ -37,7 +37,7 @@ import java.util.Map;
* A Filter that operates on a Map.
*/
@Plugin(name = "MapFilter", type = "Core", elementType = "filter", printObject = true)
-public class MapFilter extends FilterBase {
+public class MapFilter extends AbstractFilter {
private final Map<String, List<String>> map;
private final boolean isAnd;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java?rev=1396114&r1=1396113&r2=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java Tue Oct 9 17:06:20 2012
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.message.
*
*/
@Plugin(name = "MarkerFilter", type = "Core", elementType = "filter", printObject = true)
-public final class MarkerFilter extends FilterBase {
+public final class MarkerFilter extends AbstractFilter {
private final String name;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java?rev=1396114&r1=1396113&r2=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java Tue Oct 9 17:06:20 2012
@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
*
*/
@Plugin(name = "RegexFilter", type = "Core", elementType = "filter", printObject = true)
-public final class RegexFilter extends FilterBase {
+public final class RegexFilter extends AbstractFilter {
private final Pattern pattern;
private final boolean useRawMessage;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java?rev=1396114&r1=1396113&r2=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java Tue Oct 9 17:06:20 2012
@@ -34,7 +34,7 @@ import org.apache.logging.log4j.message.
* The default Level is ERROR.
*/
@Plugin(name = "ThresholdFilter", type = "Core", elementType = "filter", printObject = true)
-public final class ThresholdFilter extends FilterBase {
+public final class ThresholdFilter extends AbstractFilter {
private final Level level;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java?rev=1396114&r1=1396113&r2=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java Tue Oct 9 17:06:20 2012
@@ -30,7 +30,7 @@ import java.util.TimeZone;
* Filters events that fall within a specified time period in each day.
*/
@Plugin(name = "TimeFilter", type = "Core", elementType = "filter", printObject = true)
-public final class TimeFilter extends FilterBase {
+public final class TimeFilter extends AbstractFilter {
/**
* Length of hour in milliseconds.
*/
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java?rev=1396114&r1=1396113&r2=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java Tue Oct 9 17:06:20 2012
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.app
import org.apache.logging.log4j.core.appender.JMSQueueAppender;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.apache.logging.log4j.core.filter.CompositeFilter;
-import org.apache.logging.log4j.core.filter.FilterBase;
+import org.apache.logging.log4j.core.filter.AbstractFilter;
import org.apache.logging.log4j.core.layout.PatternLayout;
import org.apache.logging.log4j.status.StatusConsoleListener;
import org.apache.logging.log4j.status.StatusLogger;
@@ -123,7 +123,7 @@ public class JMSQueueTest {
assertTrue("Incorrect event", events.get(0).getMessage().getFormattedMessage().equals("This is a test message"));
}
- private class MessageFilter extends FilterBase {
+ private class MessageFilter extends AbstractFilter {
public MessageFilter(Result onMatch, Result onMismatch) {
super(onMatch, onMismatch);
}
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java?rev=1396114&r1=1396113&r2=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java Tue Oct 9 17:06:20 2012
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.app
import org.apache.logging.log4j.core.appender.JMSTopicAppender;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.apache.logging.log4j.core.filter.CompositeFilter;
-import org.apache.logging.log4j.core.filter.FilterBase;
+import org.apache.logging.log4j.core.filter.AbstractFilter;
import org.apache.logging.log4j.core.layout.PatternLayout;
import org.apache.logging.log4j.status.StatusConsoleListener;
import org.apache.logging.log4j.status.StatusLogger;
@@ -123,7 +123,7 @@ public class JMSTopicTest {
assertTrue("Incorrect event", events.get(0).getMessage().getFormattedMessage().equals("This is a test message"));
}
- private class MessageFilter extends FilterBase {
+ private class MessageFilter extends AbstractFilter {
public MessageFilter(Result onMatch, Result onMismatch) {
super(onMatch, onMismatch);
}
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java?rev=1396114&r1=1396113&r2=1396114&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java Tue Oct 9 17:06:20 2012
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.app
import org.apache.logging.log4j.test.appender.ListAppender;
import org.apache.logging.log4j.core.appender.SocketAppender;
import org.apache.logging.log4j.core.filter.CompositeFilter;
-import org.apache.logging.log4j.core.filter.FilterBase;
+import org.apache.logging.log4j.core.filter.AbstractFilter;
import org.apache.logging.log4j.core.layout.PatternLayout;
import org.junit.After;
import org.junit.AfterClass;
@@ -118,7 +118,7 @@ public class SocketServerTest {
assertTrue("Incorrect event", events.get(0).getMessage().getFormattedMessage().equals("This is a test message"));
}
- private class ThreadFilter extends FilterBase {
+ private class ThreadFilter extends AbstractFilter {
public ThreadFilter(Result onMatch, Result onMismatch) {
super(onMatch, onMismatch);