svn commit: r1594600 - in /logging/log4j/log4j2/trunk/log4j-core/src: main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java

[ggregory]

Author: ggregory
Date: Wed May 14 15:28:00 2014
New Revision: 1594600

URL: http://svn.apache.org/r1594600
Log:
Generate better XML for Markers.

Modified:
    
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MarkerMixIn.java
    
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java

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=1594600&r1=1594599&r2=1594600&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 15:28:00 2014
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import 
com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
 /**
@@ -32,6 +33,22 @@ import com.fasterxml.jackson.dataformat.
  * <p>
  * <em>Consider this class private.</em>
  * </p>
+ * <p>
+ * Example XML:
+ * </p>
+ * <pre>
+&lt;Marker name=&quot;Marker1&quot;&gt;
+    &lt;Parents&gt;
+        &lt;Marker name=&quot;ParentMarker1&quot;&gt;
+            &lt;Parents&gt;
+                &lt;Marker name=&quot;GrandMotherMarker&quot;/&gt;
+                &lt;Marker name=&quot;GrandFatherMarker&quot;/&gt;
+            &lt;/Parents&gt;
+        &lt;/Marker&gt;
+        &lt;Marker name=&quot;ParentMarker2&quot;/&gt;
+    &lt;/Parents&gt;
+&lt;/Marker&gt;
+ * 
  * @see Marker
  */
 // Alternate for multiple Marker implementation.
@@ -56,7 +73,8 @@ abstract class MarkerMixIn implements Ma
 
     @Override
     @JsonProperty(JSONConstants.ELT_PARENTS)
-    @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName = 
XMLConstants.ELT_PARENTS)
+    @JacksonXmlElementWrapper(namespace = XMLConstants.XML_NAMESPACE, 
localName = XMLConstants.ELT_PARENTS)
+    @JacksonXmlProperty(namespace = XMLConstants.XML_NAMESPACE, localName = 
"Marker")
     public abstract Marker[] getParents();
 
 }

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java?rev=1594600&r1=1594599&r2=1594600&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java
 Wed May 14 15:28:00 2014
@@ -45,7 +45,7 @@ class LogEventFixtures {
         final Marker gfMarker = MarkerManager.getMarker("GrandFatherMarker");
         final Marker gmMarker = MarkerManager.getMarker("GrandMotherMarker");
         cMarker.addParents(pMarker1);
-        cMarker.addParents(gfMarker);
+        cMarker.addParents(pMarker2);
         pMarker1.addParents(gmMarker);
         pMarker1.addParents(gfMarker);
         final Exception sourceHelper = new Exception();