Author: ggregory
Date: Wed May 14 05:28:12 2014
New Revision: 1594461
URL: http://svn.apache.org/r1594461
Log:
Refactor constants.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JSONConstants.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LogEventMixIn.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JSONConstants.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JSONConstants.java?rev=1594461&r1=1594460&r2=1594461&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JSONConstants.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JSONConstants.java
Wed May 14 05:28:12 2014
@@ -28,4 +28,5 @@ public final class JSONConstants {
public static final String ELT_SOURCE = "source";
public static final String ELT_SUPPRESSED = "suppressed";
public static final String ELT_THROWN = "thrown";
+ static final String ELT_MESSAGE = "message";
}
\ No newline at end of file
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LogEventMixIn.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LogEventMixIn.java?rev=1594461&r1=1594460&r2=1594461&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LogEventMixIn.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LogEventMixIn.java
Wed May 14 05:28:12 2014
@@ -76,6 +76,7 @@ abstract class LogEventMixIn implements
@Override
public abstract Marker getMarker();
+ @JsonProperty(JSONConstants.ELT_MESSAGE)
@JsonSerialize(using = MessageSerializer.class)
@JsonDeserialize(using = SimpleMessageDeserializer.class)
@JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_MESSAGE)
