You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/11/16 14:24:26 UTC
svn commit: r1410336 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel/model:
MarshalDefinition.java UnmarshalDefinition.java
Author: ningjiang
Date: Fri Nov 16 13:24:25 2012
New Revision: 1410336
URL: http://svn.apache.org/viewvc?rev=1410336&view=rev
Log:
CAMEL-5794 added xmljson dataformat into the MarshalDefinition and UnMarshalDefinition
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java?rev=1410336&r1=1410335&r2=1410336&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java Fri Nov 16 13:24:25 2012
@@ -48,6 +48,7 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.model.dataformat.XMLSecurityDataFormat;
import org.apache.camel.model.dataformat.XStreamDataFormat;
+import org.apache.camel.model.dataformat.XmlJsonDataFormat;
import org.apache.camel.model.dataformat.ZipDataFormat;
import org.apache.camel.processor.MarshalProcessor;
import org.apache.camel.spi.DataFormat;
@@ -91,6 +92,7 @@ public class MarshalDefinition extends N
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
@XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class),
+ @XmlElement(required = false, name = "xmljson", type = XmlJsonDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java?rev=1410336&r1=1410335&r2=1410336&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java Fri Nov 16 13:24:25 2012
@@ -48,6 +48,7 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.model.dataformat.XMLSecurityDataFormat;
import org.apache.camel.model.dataformat.XStreamDataFormat;
+import org.apache.camel.model.dataformat.XmlJsonDataFormat;
import org.apache.camel.model.dataformat.ZipDataFormat;
import org.apache.camel.processor.UnmarshalProcessor;
import org.apache.camel.spi.DataFormat;
@@ -91,6 +92,7 @@ public class UnmarshalDefinition extends
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
@XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class),
+ @XmlElement(required = false, name = "xmljson", type = XmlJsonDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}