svn commit: r1594462 - in /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson: JSONConstants.java ThrowableProxyMixIn.java

[ggregory]

Author: ggregory
Date: Wed May 14 05:37:44 2014
New Revision: 1594462

URL: http://svn.apache.org/r1594462
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/ThrowableProxyMixIn.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=1594462&r1=1594461&r2=1594462&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:37:44 2014
@@ -28,5 +28,6 @@ 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";
+    public static final String ELT_MESSAGE = "message";
+    public static final String ELT_EXTENDED_STACK_TRACE = "extendedStackTrace";
 }
\ No newline at end of file

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=1594462&r1=1594461&r2=1594462&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:37:44 2014
@@ -36,7 +36,7 @@ abstract class ThrowableProxyMixIn {
     @JacksonXmlProperty(isAttribute = true)
     private int commonElementCount;
 
-    @JsonProperty
+    @JsonProperty(JSONConstants.ELT_EXTENDED_STACK_TRACE)
     @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName = 
XMLConstants.ELT_EXTENDED_STACK_TRACE)
     private ExtendedStackTraceElement[] extendedStackTrace;