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/09/09 18:31:45 UTC
git commit: [LOG4J2-801] org.apache.logging.log4j.core.Logger should
be serializable. The committed classes are now Serializable and define
private static final long serialVersionUID = 1L;
Repository: logging-log4j2
Updated Branches:
refs/heads/master 101ca7559 -> 4edaf1036
[LOG4J2-801] org.apache.logging.log4j.core.Logger should be
serializable. The committed classes are now Serializable and define
private static final long serialVersionUID = 1L;
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4edaf103
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4edaf103
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4edaf103
Branch: refs/heads/master
Commit: 4edaf1036231e82e978301e0193513d08c32deac
Parents: 101ca75
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Sep 9 12:31:40 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Sep 9 12:31:40 2014 -0400
----------------------------------------------------------------------
.../apache/logging/log4j/core/layout/AbstractJacksonLayout.java | 1 +
.../org/apache/logging/log4j/core/layout/AbstractLayout.java | 4 +++-
.../apache/logging/log4j/core/layout/AbstractStringLayout.java | 2 ++
.../java/org/apache/logging/log4j/core/layout/HtmlLayout.java | 2 ++
.../java/org/apache/logging/log4j/core/layout/JsonLayout.java | 2 ++
.../java/org/apache/logging/log4j/core/layout/PatternLayout.java | 3 +++
.../java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java | 2 ++
.../org/apache/logging/log4j/core/layout/SerializedLayout.java | 2 ++
.../java/org/apache/logging/log4j/core/layout/SyslogLayout.java | 3 +++
.../java/org/apache/logging/log4j/core/layout/XmlLayout.java | 2 ++
10 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4edaf103/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
index e9243db..0215de8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
@@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.ObjectWriter;
abstract class AbstractJacksonLayout extends AbstractStringLayout {
+ private static final long serialVersionUID = 1L;
protected static final String DEFAULT_EOL = "\r\n";
protected static final String COMPACT_EOL = Strings.EMPTY;
protected final String eol;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4edaf103/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
index 477dccb..0d543a7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
@@ -30,7 +30,9 @@ import org.apache.logging.log4j.status.StatusLogger;
* @param <T>
* The Class that the Layout will format the LogEvent into.
*/
-public abstract class AbstractLayout<T extends Serializable> implements Layout<T> {
+public abstract class AbstractLayout<T extends Serializable> implements Layout<T>, Serializable {
+
+ private static final long serialVersionUID = 1L;
/**
* Allow subclasses access to the status logger without creating another instance.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4edaf103/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
index 0c57dd3..108ff41 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
@@ -26,6 +26,8 @@ import org.apache.logging.log4j.core.util.Charsets;
*/
public abstract class AbstractStringLayout extends AbstractLayout<String> {
+ private static final long serialVersionUID = 1L;
+
/**
* The charset for the formatted message.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4edaf103/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
index ecf91d5..199bfca 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
@@ -45,6 +45,8 @@ import org.apache.logging.log4j.core.util.Transform;
@Plugin(name = "HtmlLayout", category = "Core", elementType = "layout", printObject = true)
public final class HtmlLayout extends AbstractStringLayout {
+ private static final long serialVersionUID = 1L;
+
private static final int BUF_SIZE = 256;
private static final String TRACE_PREFIX = "<br /> ";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4edaf103/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
index 23c83c5..a743a61 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
@@ -792,6 +792,8 @@ import org.apache.logging.log4j.core.util.Charsets;
@Plugin(name = "JsonLayout", category = "Core", elementType = "layout", printObject = true)
public final class JsonLayout extends AbstractJacksonLayout {
+ private static final long serialVersionUID = 1L;
+
protected JsonLayout(final boolean locationInfo, final boolean properties, final boolean complete, final boolean compact,
final Charset charset) {
super(new JacksonFactory.JSON().newWriter(locationInfo, properties, compact), charset, compact, complete);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4edaf103/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index 6d3fd37..7f2e9d3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -51,6 +51,9 @@ import org.apache.logging.log4j.core.pattern.RegexReplacement;
*/
@Plugin(name = "PatternLayout", category = "Core", elementType = "layout", printObject = true)
public final class PatternLayout extends AbstractStringLayout {
+
+ private static final long serialVersionUID = 1L;
+
/**
* Default pattern string for log output. Currently set to the
* string <b>"%m%n"</b> which just prints the application supplied
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4edaf103/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
index 2fbdbcc..7bd6b81 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
@@ -62,6 +62,8 @@ import org.apache.logging.log4j.util.Strings;
@Plugin(name = "Rfc5424Layout", category = "Core", elementType = "layout", printObject = true)
public final class Rfc5424Layout extends AbstractStringLayout {
+ private static final long serialVersionUID = 1L;
+
private static final String LF = "\n";
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4edaf103/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
index 5bd6b1b..e465339 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
@@ -30,6 +30,8 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@Plugin(name = "SerializedLayout", category = "Core", elementType = "layout", printObject = true)
public final class SerializedLayout extends AbstractLayout<LogEvent> {
+ private static final long serialVersionUID = 1L;
+
private static byte[] serializedHeader;
static {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4edaf103/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
index 0fe2833..0f09845 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
@@ -39,6 +39,9 @@ import org.apache.logging.log4j.core.util.NetUtils;
*/
@Plugin(name = "SyslogLayout", category = "Core", elementType = "layout", printObject = true)
public final class SyslogLayout extends AbstractStringLayout {
+
+ private static final long serialVersionUID = 1L;
+
/**
* Match newlines in a platform-independent manner.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4edaf103/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
index 0038fec..402df6f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
@@ -187,6 +187,8 @@ import org.apache.logging.log4j.core.util.Charsets;
@Plugin(name = "XmlLayout", category = "Core", elementType = "layout", printObject = true)
public final class XmlLayout extends AbstractJacksonLayout {
+ private static final long serialVersionUID = 1L;
+
private static final String ROOT_TAG = "Events";
protected XmlLayout(final boolean locationInfo, final boolean properties, final boolean complete, final boolean compact, final Charset charset) {