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:44:28 UTC
svn commit: r1410337 - in /camel/branches/camel-2.10.x: ./
camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
Author: ningjiang
Date: Fri Nov 16 13:44:27 2012
New Revision: 1410337
URL: http://svn.apache.org/viewvc?rev=1410337&view=rev
Log:
CAMEL-5794 added xmljson dataformat into the MarshalDefinition and UnMarshalDefinition
Merged revisions 1410336 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1410336 | ningjiang | 2012-11-16 21:24:25 +0800 (Fri, 16 Nov 2012) | 1 line
CAMEL-5794 added xmljson dataformat into the MarshalDefinition and UnMarshalDefinition
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1410336
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java?rev=1410337&r1=1410336&r2=1410337&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java Fri Nov 16 13:44:27 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/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java?rev=1410337&r1=1410336&r2=1410337&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java Fri Nov 16 13:44:27 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)}