Author: ggregory
Date: Wed May 14 21:28:16 2014
New Revision: 1594728
URL: http://svn.apache.org/r1594728
Log:
Better XML representation of array and array items.
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/ThrowableProxyMixIn.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/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=1594728&r1=1594727&r2=1594728&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 21:28:16 2014
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.annotation.
import com.fasterxml.jackson.annotation.JsonRootName;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import
com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
@@ -52,7 +53,8 @@ abstract class LogEventMixIn implements
public abstract Map<String, String> getContextMap();
@JsonProperty(JSONConstants.ELT_CONTEXT_STACK)
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_CONTEXT_STACK)
+ @JacksonXmlElementWrapper(namespace = XMLConstants.XML_NAMESPACE,
localName = XMLConstants.ELT_CONTEXT_STACK)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_CONTEXT_STACK_ITEM)
@Override
public abstract ContextStack getContextStack();
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=1594728&r1=1594727&r2=1594728&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 21:28:16 2014
@@ -21,6 +21,7 @@ import org.apache.logging.log4j.core.imp
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
+import
com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
/**
@@ -37,7 +38,8 @@ abstract class ThrowableProxyMixIn {
private int commonElementCount;
@JsonProperty(JSONConstants.ELT_EXTENDED_STACK_TRACE)
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_EXTENDED_STACK_TRACE)
+ @JacksonXmlElementWrapper(namespace = XMLConstants.XML_NAMESPACE,
localName = XMLConstants.ELT_EXTENDED_STACK_TRACE)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_EXTENDED_STACK_TRACE_ITEM)
private ExtendedStackTraceElement[] extendedStackTrace;
@JsonProperty
@@ -65,7 +67,8 @@ abstract class ThrowableProxyMixIn {
public abstract StackTraceElement[] getStackTrace();
@JsonProperty(JSONConstants.ELT_SUPPRESSED)
- @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_SUPPRESSED)
+ @JacksonXmlElementWrapper(namespace = XMLConstants.XML_NAMESPACE,
localName = XMLConstants.ELT_SUPPRESSED)
+ @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName =
XMLConstants.ELT_SUPPRESSED_ITEM)
public abstract ThrowableProxy[] getSuppressedProxies();
@JsonIgnore
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/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?rev=1594728&r1=1594727&r2=1594728&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/XMLConstants.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/XMLConstants.java
Wed May 14 21:28:16 2014
@@ -23,13 +23,16 @@ public final class XMLConstants {
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_CONTEXT_STACK_ITEM = "ContextStackItem";
public static final String ELT_EVENT = "Event";
public static final String ELT_EXTENDED_STACK_TRACE = "ExtendedStackTrace";
+ public static final String ELT_EXTENDED_STACK_TRACE_ITEM =
"ExtendedStackTraceItem";
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_SUPPRESSED_ITEM = "SuppressedItem";
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
