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 2014/08/25 20:22:14 UTC
svn commit: r1620401 - in /logging/log4j/log4j2/trunk:
log4j-core/src/main/java/org/apache/logging/log4j/core/
log4j-core/src/main/java/org/apache/logging/log4j/core/filter/
log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/
log4j-core/src...
Author: ggregory
Date: Mon Aug 25 18:22:14 2014
New Revision: 1620401
URL: http://svn.apache.org/r1620401
Log:
[LOG4J2-800] All life cycle implementations should be serializable.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java
logging/log4j/log4j2/trunk/src/changes/changes.xml
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java Mon Aug 25 18:22:14 2014
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core;
+import java.io.Serializable;
+
import org.apache.logging.log4j.status.StatusLogger;
/**
@@ -24,7 +26,9 @@ import org.apache.logging.log4j.status.S
* Wraps a {@link LifeCycle.State}.
* </p>
*/
-public class AbstractLifeCycle implements LifeCycle {
+public class AbstractLifeCycle implements LifeCycle, Serializable {
+
+ private static final long serialVersionUID = 1L;
/**
* Allow subclasses access to the status logger without creating another instance.
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java Mon Aug 25 18:22:14 2014
@@ -58,6 +58,8 @@ import static org.apache.logging.log4j.c
*/
public class LoggerContext extends AbstractLifeCycle implements org.apache.logging.log4j.spi.LoggerContext, ConfigurationListener {
+ private static final long serialVersionUID = 1L;
+
private static final boolean SHUTDOWN_HOOK_ENABLED =
PropertiesUtil.getProperties().getBooleanProperty(ShutdownRegistrationStrategy.SHUTDOWN_HOOK_ENABLED, true);
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java Mon Aug 25 18:22:14 2014
@@ -32,6 +32,8 @@ import org.apache.logging.log4j.message.
*/
public abstract class AbstractFilter extends AbstractLifeCycle implements Filter {
+ private static final long serialVersionUID = 1L;
+
/**
* The onMatch Result.
*/
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java Mon Aug 25 18:22:14 2014
@@ -27,6 +27,8 @@ import org.apache.logging.log4j.core.Log
*/
public abstract class AbstractFilterable extends AbstractLifeCycle implements Filterable {
+ private static final long serialVersionUID = 1L;
+
/**
* May be null.
*/
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java Mon Aug 25 18:22:14 2014
@@ -55,6 +55,8 @@ import org.apache.logging.log4j.message.
@Plugin(name = "BurstFilter", category = "Core", elementType = "filter", printObject = true)
public final class BurstFilter extends AbstractFilter {
+ private static final long serialVersionUID = 1L;
+
private static final long NANOS_IN_SECONDS = 1000000000;
private static final int DEFAULT_RATE = 10;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java Mon Aug 25 18:22:14 2014
@@ -39,6 +39,8 @@ import org.apache.logging.log4j.message.
@Plugin(name = "filters", category = "Core", printObject = true)
public final class CompositeFilter extends AbstractLifeCycle implements Iterable<Filter>, Filter {
+ private static final long serialVersionUID = 1L;
+
private final List<Filter> filters;
private CompositeFilter() {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java Mon Aug 25 18:22:14 2014
@@ -36,6 +36,9 @@ import org.apache.logging.log4j.message.
*/
@Plugin(name = "DynamicThresholdFilter", category = "Core", elementType = "filter", printObject = true)
public final class DynamicThresholdFilter extends AbstractFilter {
+
+ private static final long serialVersionUID = 1L;
+
private Map<String, Level> levelMap = new HashMap<String, Level>();
private Level defaultThreshold = Level.ERROR;
private final String key;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java Mon Aug 25 18:22:14 2014
@@ -38,6 +38,9 @@ import org.apache.logging.log4j.message.
*/
@Plugin(name = "MapFilter", category = "Core", elementType = "filter", printObject = true)
public class MapFilter extends AbstractFilter {
+
+ private static final long serialVersionUID = 1L;
+
private final Map<String, List<String>> map;
private final boolean isAnd;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java Mon Aug 25 18:22:14 2014
@@ -33,6 +33,8 @@ import org.apache.logging.log4j.message.
@Plugin(name = "MarkerFilter", category = "Core", elementType = "filter", printObject = true)
public final class MarkerFilter extends AbstractFilter {
+ private static final long serialVersionUID = 1L;
+
private final String name;
private MarkerFilter(final String name, final Result onMatch, final Result onMismatch) {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java Mon Aug 25 18:22:14 2014
@@ -42,6 +42,8 @@ import org.apache.logging.log4j.message.
@Plugin(name = "RegexFilter", category = "Core", elementType = "filter", printObject = true)
public final class RegexFilter extends AbstractFilter {
+ private static final long serialVersionUID = 1L;
+
private static final int DEFAULT_PATTERN_FLAGS = 0;
private final Pattern pattern;
private final boolean useRawMessage;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java Mon Aug 25 18:22:14 2014
@@ -36,6 +36,8 @@ import org.apache.logging.log4j.message.
@Plugin(name = "ThresholdFilter", category = "Core", elementType = "filter", printObject = true)
public final class ThresholdFilter extends AbstractFilter {
+ private static final long serialVersionUID = 1L;
+
private final Level level;
private ThresholdFilter(final Level level, final Result onMatch, final Result onMismatch) {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java Mon Aug 25 18:22:14 2014
@@ -31,6 +31,9 @@ import org.apache.logging.log4j.core.con
*/
@Plugin(name = "TimeFilter", category = "Core", elementType = "filter", printObject = true)
public final class TimeFilter extends AbstractFilter {
+
+ private static final long serialVersionUID = 1L;
+
/**
* Length of hour in milliseconds.
*/
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java Mon Aug 25 18:22:14 2014
@@ -122,6 +122,9 @@ public class JmsQueueTest {
}
private class MessageFilter extends AbstractFilter {
+
+ private static final long serialVersionUID = 1L;
+
public MessageFilter(final Result onMatch, final Result onMismatch) {
super(onMatch, onMismatch);
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java Mon Aug 25 18:22:14 2014
@@ -123,6 +123,9 @@ public class JmsTopicTest {
}
private class MessageFilter extends AbstractFilter {
+
+ private static final long serialVersionUID = 1L;
+
public MessageFilter(final Result onMatch, final Result onMismatch) {
super(onMatch, onMismatch);
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java Mon Aug 25 18:22:14 2014
@@ -54,6 +54,8 @@ public abstract class AbstractSocketServ
private class ThreadFilter extends AbstractFilter {
+ private static final long serialVersionUID = 1L;
+
public ThreadFilter(final Result onMatch, final Result onMismatch) {
super(onMatch, onMismatch);
}
Modified: logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java (original)
+++ logging/log4j/log4j2/trunk/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java Mon Aug 25 18:22:14 2014
@@ -43,6 +43,8 @@ import org.apache.logging.log4j.spi.Logg
*/
final class Log4jWebInitializerImpl extends AbstractLifeCycle implements Log4jWebLifeCycle {
+ private static final long serialVersionUID = 1L;
+
static {
if (Loader.isClassAvailable("org.apache.logging.log4j.core.web.JNDIContextFilter")) {
throw new IllegalStateException("You are using Log4j 2 in a web application with the old, extinct " +
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1620401&r1=1620400&r2=1620401&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Aug 25 18:22:14 2014
@@ -37,6 +37,9 @@
<action issue="LOG4J2-766" dev="ggregory" type="update" due-to="Bruno P. Kinoshita">
Incomplete documentation for JSONLayout.
</action>
+ <action issue="LOG4J2-800" dev="ggregory" type="update">
+ All life cycle implementations should be serializable.
+ </action>
</release>
<release version="2.0.2" date="2014-08-16" description="Bug fixes and enhancements">
<action issue="LOG4J2-775" dev="ggregory" type="update">