You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/06/16 08:30:11 UTC
svn commit: r1136296 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel/model:
MarshalDefinition.java UnmarshalDefinition.java
Author: davsclaus
Date: Thu Jun 16 06:30:11 2011
New Revision: 1136296
URL: http://svn.apache.org/viewvc?rev=1136296&view=rev
Log:
CAMEL-4111: marshal and unmarshal should not support outputs in the DSL.
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=1136296&r1=1136295&r2=1136296&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 Thu Jun 16 06:30:11 2011
@@ -58,9 +58,8 @@ import org.apache.camel.spi.RouteContext
*/
@XmlRootElement(name = "marshal")
@XmlAccessorType(XmlAccessType.FIELD)
-public class MarshalDefinition extends OutputDefinition<MarshalDefinition> {
+public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
- // TODO: Camel 3.0 Should extend NoOutputDefinition
// TODO: Camel 3.0, ref attribute should be removed as RefDataFormat is to be used instead
@XmlAttribute
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=1136296&r1=1136295&r2=1136296&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 Thu Jun 16 06:30:11 2011
@@ -58,9 +58,8 @@ import org.apache.camel.spi.RouteContext
*/
@XmlRootElement(name = "unmarshal")
@XmlAccessorType(XmlAccessType.FIELD)
-public class UnmarshalDefinition extends OutputDefinition<UnmarshalDefinition> {
+public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> {
- // TODO: Camel 3.0 Should extend NoOutputDefinition
// TODO: Camel 3.0, ref attribute should be removed as RefDataFormat is to be used instead
@XmlAttribute