Author: ggregory
Date: Wed May 14 05:02:12 2014
New Revision: 1594453
URL: http://svn.apache.org/r1594453
Log:
Refactor constants.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LogEventMixIn.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java
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=1594453&r1=1594452&r2=1594453&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:02:12 2014
@@ -41,7 +41,7 @@ import com.fasterxml.jackson.dataformat.
@JacksonXmlRootElement(namespace = XMLConstants.XML_NAMESPACE, localName =
"Event")
@JsonFilter("org.apache.logging.log4j.core.impl.Log4jLogEvent")
@JsonPropertyOrder({ "timeMillis", "threadName", "level", "loggerName",
"marker", "message", "thrown", XMLConstants.TAG_CONTEXT_MAP,
- "ContextStack", "loggerFQCN", "Source", "endOfBatch" })
+ JSONConstants.PROP_CONTEXT_STACK, "loggerFQCN", "Source", "endOfBatch"
})
abstract class LogEventMixIn implements LogEvent {
private static final long serialVersionUID = 1L;
@@ -53,8 +53,8 @@ abstract class LogEventMixIn implements
@Override
public abstract Map<String, String> getContextMap();
- @JsonProperty("contextStack")
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
"ContextStack")
+ @JsonProperty(JSONConstants.PROP_CONTEXT_STACK)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.TAG_CONTEXT_STACK)
@Override
public abstract ContextStack getContextStack();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java?rev=1594453&r1=1594452&r2=1594453&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java
Wed May 14 05:02:12 2014
@@ -22,4 +22,5 @@ package org.apache.logging.log4j.core.la
public final class JSONConstants {
public static final String PROP_SOURCE = "source";
public static final String PROP_CONTEXT_MAP = "contextMap";
+ public static final String PROP_CONTEXT_STACK = "contextStack";
}
\ No newline at end of file
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java?rev=1594453&r1=1594452&r2=1594453&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java
Wed May 14 05:02:12 2014
@@ -22,5 +22,6 @@ package org.apache.logging.log4j.core.la
public final class XMLConstants {
public static final String TAG_SOURCE = "Source";
public static final String TAG_CONTEXT_MAP = "ContextMap";
+ public static final String TAG_CONTEXT_STACK = "ContextStack";
public static final String XML_NAMESPACE =
"http://logging.apache.org/log4j/2.0/events";;
}
\ No newline at end of file
