Author: ggregory
Date: Wed May 14 05:17:57 2014
New Revision: 1594457
URL: http://svn.apache.org/r1594457
Log:
Refactor constants.
Added:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JSONConstants.java
- copied, changed from r1594453,
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/jackson/XMLConstants.java
- copied, changed from r1594453,
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java
Removed:
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
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ThrowableProxyMixIn.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JSONConstants.java
(from r1594453,
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/jackson/JSONConstants.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JSONConstants.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java&r1=1594453&r2=1594457&rev=1594457&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/jackson/JSONConstants.java
Wed May 14 05:17:57 2014
@@ -14,13 +14,18 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.layout;
+package org.apache.logging.log4j.core.jackson;
/**
* Keeps constants separate from any class that may depend on third party jars.
*/
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";
+ public static final String ELT_CAUSE = "cause";
+ public static final String ELT_CONTEXT_MAP = "contextMap";
+ public static final String ELT_CONTEXT_STACK = "contextStack";
+ public static final String ELT_MARKER = "marker";
+ public static final String ELT_PARENTS = "parents";
+ public static final String ELT_SOURCE = "source";
+ public static final String ELT_SUPPRESSED = "suppressed";
+ public static final String ELT_THROWN = "thrown";
}
\ 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=1594457&r1=1594456&r2=1594457&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:17:57 2014
@@ -23,8 +23,6 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext.ContextStack;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.impl.ThrowableProxy;
-import org.apache.logging.log4j.core.layout.JSONConstants;
-import org.apache.logging.log4j.core.layout.XMLConstants;
import org.apache.logging.log4j.message.Message;
import com.fasterxml.jackson.annotation.JsonFilter;
@@ -37,24 +35,24 @@ import com.fasterxml.jackson.databind.an
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-@JsonRootName("Event")
-@JacksonXmlRootElement(namespace = XMLConstants.XML_NAMESPACE, localName =
"Event")
+@JsonRootName(XMLConstants.ELT_EVENT)
+@JacksonXmlRootElement(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_EVENT)
@JsonFilter("org.apache.logging.log4j.core.impl.Log4jLogEvent")
-@JsonPropertyOrder({ "timeMillis", "threadName", "level", "loggerName",
"marker", "message", "thrown", XMLConstants.TAG_CONTEXT_MAP,
- JSONConstants.PROP_CONTEXT_STACK, "loggerFQCN", "Source", "endOfBatch"
})
+@JsonPropertyOrder({ "timeMillis", "threadName", "level", "loggerName",
"marker", "message", "thrown", XMLConstants.ELT_CONTEXT_MAP,
+ JSONConstants.ELT_CONTEXT_STACK, "loggerFQCN", "Source", "endOfBatch"
})
abstract class LogEventMixIn implements LogEvent {
private static final long serialVersionUID = 1L;
- @JsonProperty(JSONConstants.PROP_CONTEXT_MAP)
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.TAG_CONTEXT_MAP)
+ @JsonProperty(JSONConstants.ELT_CONTEXT_MAP)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_CONTEXT_MAP)
@JsonSerialize(using = ListOfMapEntrySerializer.class)
@JsonDeserialize(using = ListOfMapEntryDeserializer.class)
@Override
public abstract Map<String, String> getContextMap();
- @JsonProperty(JSONConstants.PROP_CONTEXT_STACK)
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.TAG_CONTEXT_STACK)
+ @JsonProperty(JSONConstants.ELT_CONTEXT_STACK)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_CONTEXT_STACK)
@Override
public abstract ContextStack getContextStack();
@@ -73,20 +71,20 @@ abstract class LogEventMixIn implements
@Override
public abstract String getLoggerName();
- @JsonProperty("marker")
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
"Marker")
+ @JsonProperty(JSONConstants.ELT_MARKER)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_MARKER)
@Override
public abstract Marker getMarker();
@JsonSerialize(using = MessageSerializer.class)
@JsonDeserialize(using = SimpleMessageDeserializer.class)
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
"Message")
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_MESSAGE)
@Override
public abstract Message getMessage();
- @JsonProperty(JSONConstants.PROP_SOURCE)
+ @JsonProperty(JSONConstants.ELT_SOURCE)
@JsonDeserialize(using = Log4jStackTraceElementDeserializer.class)
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.TAG_SOURCE)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_SOURCE)
@Override
public abstract StackTraceElement getSource();
@@ -99,8 +97,8 @@ abstract class LogEventMixIn implements
@Override
public abstract Throwable getThrown();
- @JsonProperty("thrown")
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
"Thrown")
+ @JsonProperty(JSONConstants.ELT_THROWN)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_THROWN)
@Override
public abstract ThrowableProxy getThrownProxy();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java?rev=1594457&r1=1594456&r2=1594457&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
Wed May 14 05:17:57 2014
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.jackson;
import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.core.layout.XMLConstants;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -56,8 +55,8 @@ abstract class MarkerMixIn implements Ma
public abstract Marker getParent();
@Override
- @JsonProperty("parents")
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
"Parents")
+ @JsonProperty(JSONConstants.ELT_PARENTS)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_PARENTS)
public abstract Marker[] getParents();
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ThrowableProxyMixIn.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ThrowableProxyMixIn.java?rev=1594457&r1=1594456&r2=1594457&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ThrowableProxyMixIn.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ThrowableProxyMixIn.java
Wed May 14 05:17:57 2014
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.core.ja
import org.apache.logging.log4j.core.impl.ExtendedStackTraceElement;
import org.apache.logging.log4j.core.impl.ThrowableProxy;
-import org.apache.logging.log4j.core.layout.XMLConstants;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -29,8 +28,8 @@ import com.fasterxml.jackson.dataformat.
*/
abstract class ThrowableProxyMixIn {
- @JsonProperty("cause")
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
"Cause")
+ @JsonProperty(JSONConstants.ELT_CAUSE)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_CAUSE)
private ThrowableProxyMixIn causeProxy;
@JsonProperty
@@ -38,7 +37,7 @@ abstract class ThrowableProxyMixIn {
private int commonElementCount;
@JsonProperty
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
"ExtendedStackTrace")
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_EXTENDED_STACK_TRACE)
private ExtendedStackTraceElement[] extendedStackTrace;
@JsonProperty
@@ -65,8 +64,8 @@ abstract class ThrowableProxyMixIn {
@JsonIgnore
public abstract StackTraceElement[] getStackTrace();
- @JsonProperty("suppressed")
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
"Suppressed")
+ @JsonProperty(JSONConstants.ELT_SUPPRESSED)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_SUPPRESSED)
public abstract ThrowableProxy[] getSuppressedProxies();
@JsonIgnore
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/XMLConstants.java
(from r1594453,
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/jackson/XMLConstants.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/XMLConstants.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java&r1=1594453&r2=1594457&rev=1594457&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/jackson/XMLConstants.java
Wed May 14 05:17:57 2014
@@ -14,14 +14,22 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.layout;
+package org.apache.logging.log4j.core.jackson;
/**
* Keeps constants separate from any class that may depend on third party jars.
*/
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 ELT_CAUSE = "Cause";
+ public static final String ELT_CONTEXT_MAP = "ContextMap";
+ public static final String ELT_CONTEXT_STACK = "ContextStack";
+ public static final String ELT_EVENT = "Event";
+ public static final String ELT_EXTENDED_STACK_TRACE = "ExtendedStackTrace";
+ public static final String ELT_MARKER = "Marker";
+ public static final String ELT_MESSAGE = "Message";
+ public static final String ELT_PARENTS = "Parents";
+ public static final String ELT_SOURCE = "Source";
+ public static final String ELT_SUPPRESSED = "Suppressed";
+ public static final String ELT_THROWN = "Thrown";
public static final String XML_NAMESPACE =
"http://logging.apache.org/log4j/2.0/events";;
}
\ No newline at end of file
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java?rev=1594457&r1=1594456&r2=1594457&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JacksonFactory.java
Wed May 14 05:17:57 2014
@@ -20,8 +20,10 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
+import org.apache.logging.log4j.core.jackson.JSONConstants;
import org.apache.logging.log4j.core.jackson.Log4jJsonObjectMapper;
import org.apache.logging.log4j.core.jackson.Log4jXmlObjectMapper;
+import org.apache.logging.log4j.core.jackson.XMLConstants;
import com.fasterxml.jackson.core.PrettyPrinter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
@@ -38,12 +40,12 @@ abstract class JacksonFactory {
@Override
protected String getPropertNameForContextMap() {
- return JSONConstants.PROP_CONTEXT_MAP;
+ return JSONConstants.ELT_CONTEXT_MAP;
}
@Override
protected String getPropertNameForSource() {
- return JSONConstants.PROP_SOURCE;
+ return JSONConstants.ELT_SOURCE;
}
@Override
@@ -66,12 +68,12 @@ abstract class JacksonFactory {
@Override
protected String getPropertNameForContextMap() {
- return XMLConstants.TAG_CONTEXT_MAP;
+ return XMLConstants.ELT_CONTEXT_MAP;
}
@Override
protected String getPropertNameForSource() {
- return XMLConstants.TAG_SOURCE;
+ return XMLConstants.ELT_SOURCE;
}
@Override
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java?rev=1594457&r1=1594456&r2=1594457&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
Wed May 14 05:17:57 2014
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.jackson.XMLConstants;
import org.apache.logging.log4j.core.util.Charsets;
/**
