camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1075067 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/model: ./ language/
Date Sun, 27 Feb 2011 14:47:28 GMT
Author: davsclaus
Date: Sun Feb 27 14:47:27 2011
New Revision: 1075067

URL: http://svn.apache.org/viewvc?rev=1075067&view=rev
Log:
Polished model

Added:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
      - copied, changed from r1075006, camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputExpressionNode.java
  (contents, props changed)
      - copied, changed from r1075006, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
Removed:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java Sun Feb
27 14:47:27 2011
@@ -40,7 +40,7 @@ import org.apache.camel.util.concurrent.
  */
 @XmlRootElement(name = "delay")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class DelayDefinition extends ExpressionNode implements ExecutorServiceAwareDefinition<DelayDefinition>
{
+public class DelayDefinition extends OutputExpressionNode implements ExecutorServiceAwareDefinition<DelayDefinition>
{
 
     // TODO: Camel 3.0 Should extend NoOutputExpressionNode
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
Sun Feb 27 14:47:27 2011
@@ -33,7 +33,7 @@ import org.apache.camel.spi.RouteContext
  */
 @XmlRootElement(name = "dynamicRouter")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class DynamicRouterDefinition<Type extends ProcessorDefinition> extends NoOutputExpressionNode
{
+public class DynamicRouterDefinition<Type extends ProcessorDefinition> extends ExpressionNode
{
 
     public static final String DEFAULT_DELIMITER = ",";
 

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java (from
r1075006, camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java&r1=1075006&r2=1075067&rev=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java Sun Feb
27 14:47:27 2011
@@ -20,13 +20,17 @@ import java.util.Collections;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElementRef;
 
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
+import org.apache.camel.Processor;
 import org.apache.camel.model.language.ExpressionDefinition;
+import org.apache.camel.processor.FilterProcessor;
+import org.apache.camel.spi.RouteContext;
 
 /**
- * An {@link org.apache.camel.model.ExpressionNode} which does <b>not</b> support
any outputs.
+ * A base class for nodes which contain an expression
  * <p/>
  * This node is to be extended by definitions which need to support an expression but the
definition should not
  * contain any outputs, such as {@link org.apache.camel.model.TransformDefinition}.
@@ -34,22 +38,41 @@ import org.apache.camel.model.language.E
  * @version 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-public class NoOutputExpressionNode extends ExpressionNode {
+public class ExpressionNode extends ProcessorDefinition<OutputExpressionNode> {
 
-    public NoOutputExpressionNode() {
-        super();
+    @XmlElementRef
+    protected ExpressionDefinition expression;
+
+    public ExpressionNode() {
     }
 
-    public NoOutputExpressionNode(ExpressionDefinition expression) {
-        super(expression);
+    public ExpressionNode(ExpressionDefinition expression) {
+        this.expression = expression;
     }
 
-    public NoOutputExpressionNode(Expression expression) {
-        super(expression);
+    public ExpressionNode(Expression expression) {
+        if (expression != null) {
+            setExpression(new ExpressionDefinition(expression));
+        }
     }
 
-    public NoOutputExpressionNode(Predicate predicate) {
-        super(predicate);
+    public ExpressionNode(Predicate predicate) {
+        if (predicate != null) {
+            setExpression(new ExpressionDefinition(predicate));
+        }
+    }
+
+    @Override
+    public String getShortName() {
+        return "exp";
+    }
+
+    public ExpressionDefinition getExpression() {
+        return expression;
+    }
+
+    public void setExpression(ExpressionDefinition expression) {
+        this.expression = expression;
     }
 
     @Override
@@ -69,4 +92,17 @@ public class NoOutputExpressionNode exte
         getParent().addOutput(output);
     }
 
+    @Override
+    public String getLabel() {
+        if (getExpression() == null) {
+            return "";
+        }
+        return getExpression().getLabel();
+    }
+
+    protected FilterProcessor createFilterProcessor(RouteContext routeContext) throws Exception
{
+        Processor childProcessor = this.createChildProcessor(routeContext, false);
+        return new FilterProcessor(getExpression().createPredicate(routeContext), childProcessor);
+    }
+
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java Sun
Feb 27 14:47:27 2011
@@ -33,7 +33,7 @@ import org.apache.camel.spi.RouteContext
  */
 @XmlRootElement(name = "filter")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class FilterDefinition extends ExpressionNode {
+public class FilterDefinition extends OutputExpressionNode {
 
     public FilterDefinition() {
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
Sun Feb 27 14:47:27 2011
@@ -37,7 +37,7 @@ import org.apache.camel.util.ObjectHelpe
  */
 @XmlRootElement(name = "idempotentConsumer")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class IdempotentConsumerDefinition extends ExpressionNode {
+public class IdempotentConsumerDefinition extends OutputExpressionNode {
     @XmlAttribute
     private String messageIdRepositoryRef;
     @XmlAttribute

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java Sun Feb
27 14:47:27 2011
@@ -33,7 +33,7 @@ import org.apache.camel.spi.RouteContext
  */
 @XmlRootElement(name = "loop")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class LoopDefinition extends ExpressionNode {
+public class LoopDefinition extends OutputExpressionNode {
 
     public LoopDefinition() {
     }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputExpressionNode.java
(from r1075006, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputExpressionNode.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputExpressionNode.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java&r1=1075006&r2=1075067&rev=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputExpressionNode.java
Sun Feb 27 14:47:27 2011
@@ -18,18 +18,13 @@ package org.apache.camel.model;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElementRef;
 
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
-import org.apache.camel.Processor;
 import org.apache.camel.model.language.ExpressionDefinition;
-import org.apache.camel.processor.FilterProcessor;
-import org.apache.camel.spi.Required;
-import org.apache.camel.spi.RouteContext;
 
 /**
  * A base class for nodes which contain an expression and a number of outputs
@@ -37,43 +32,23 @@ import org.apache.camel.spi.RouteContext
  * @version 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ExpressionNode extends ProcessorDefinition<ExpressionNode> {
-    @XmlElementRef
-    protected ExpressionDefinition expression;
+public class OutputExpressionNode extends ExpressionNode {
     @XmlElementRef
     protected List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
 
-    public ExpressionNode() {
-    }
-
-    public ExpressionNode(ExpressionDefinition expression) {
-        this.expression = expression;
-    }
-
-    public ExpressionNode(Expression expression) {
-        if (expression != null) {
-            setExpression(new ExpressionDefinition(expression));
-        }
+    public OutputExpressionNode() {
     }
 
-    public ExpressionNode(Predicate predicate) {
-        if (predicate != null) {
-            setExpression(new ExpressionDefinition(predicate));
-        }
+    public OutputExpressionNode(ExpressionDefinition expression) {
+        super(expression);
     }
 
-    @Override
-    public String getShortName() {
-        return "exp";
-    }
-      
-    public ExpressionDefinition getExpression() {
-        return expression;
+    public OutputExpressionNode(Expression expression) {
+        super(expression);
     }
 
-    @Required
-    public void setExpression(ExpressionDefinition expression) {
-        this.expression = expression;
+    public OutputExpressionNode(Predicate predicate) {
+        super(predicate);
     }
 
     public List<ProcessorDefinition> getOutputs() {
@@ -84,21 +59,13 @@ public class ExpressionNode extends Proc
         this.outputs = outputs;
     }
 
+    @Override
     public boolean isOutputSupported() {
         return true;
     }
 
     @Override
-    public String getLabel() {
-        if (getExpression() == null) {
-            return "";
-        }
-        return getExpression().getLabel();
+    public void addOutput(ProcessorDefinition output) {
+        outputs.add(output);
     }
-
-    protected FilterProcessor createFilterProcessor(RouteContext routeContext) throws Exception
{
-        Processor childProcessor = this.createChildProcessor(routeContext, false);
-        return new FilterProcessor(getExpression().createPredicate(routeContext), childProcessor);
-    }
-
 }

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputExpressionNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputExpressionNode.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
Sun Feb 27 14:47:27 2011
@@ -39,7 +39,7 @@ import org.apache.camel.util.concurrent.
  */
 @XmlRootElement(name = "recipientList")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class RecipientListDefinition<Type extends ProcessorDefinition> extends NoOutputExpressionNode
implements ExecutorServiceAwareDefinition<RecipientListDefinition> {
+public class RecipientListDefinition<Type extends ProcessorDefinition> extends ExpressionNode
implements ExecutorServiceAwareDefinition<RecipientListDefinition> {
     @XmlTransient
     private AggregationStrategy aggregationStrategy;
     @XmlTransient

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
Sun Feb 27 14:47:27 2011
@@ -35,7 +35,7 @@ import org.apache.camel.spi.RouteContext
  */
 @XmlRootElement(name = "routingSlip")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class RoutingSlipDefinition<Type extends ProcessorDefinition> extends NoOutputExpressionNode
{
+public class RoutingSlipDefinition<Type extends ProcessorDefinition> extends ExpressionNode
{
     public static final String DEFAULT_DELIMITER = ",";
 
     @XmlAttribute

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java Sun
Feb 27 14:47:27 2011
@@ -30,7 +30,7 @@ import org.apache.camel.spi.RouteContext
  */
 @XmlRootElement(name = "setBody")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SetBodyDefinition extends NoOutputExpressionNode {
+public class SetBodyDefinition extends ExpressionNode {
 
     public SetBodyDefinition() {
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
Sun Feb 27 14:47:27 2011
@@ -30,7 +30,7 @@ import org.apache.camel.spi.RouteContext
  */
 @XmlRootElement(name = "setFaultBody")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SetFaultBodyDefinition extends NoOutputExpressionNode {
+public class SetFaultBodyDefinition extends ExpressionNode {
 
     public SetFaultBodyDefinition() {
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java Sun
Feb 27 14:47:27 2011
@@ -35,7 +35,7 @@ import org.apache.camel.util.ObjectHelpe
  */
 @XmlRootElement(name = "setHeader")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SetHeaderDefinition extends NoOutputExpressionNode {
+public class SetHeaderDefinition extends ExpressionNode {
     @XmlAttribute(required = true)
     private String headerName;
     

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
Sun Feb 27 14:47:27 2011
@@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelpe
  */
 @XmlRootElement(name = "setOutHeader")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SetOutHeaderDefinition extends NoOutputExpressionNode {
+public class SetOutHeaderDefinition extends ExpressionNode {
     @XmlAttribute(required = true)
     private String headerName;
     

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
Sun Feb 27 14:47:27 2011
@@ -35,7 +35,7 @@ import org.apache.camel.util.ObjectHelpe
  */
 @XmlRootElement(name = "setProperty")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SetPropertyDefinition extends NoOutputExpressionNode {
+public class SetPropertyDefinition extends ExpressionNode {
     @XmlAttribute(required = true)
     private String propertyName;
     

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java Sun Feb
27 14:47:27 2011
@@ -37,7 +37,7 @@ import static org.apache.camel.builder.E
  */
 @XmlRootElement(name = "sort")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SortDefinition extends NoOutputExpressionNode {
+public class SortDefinition extends ExpressionNode {
     @XmlTransient
     private Comparator<Object> comparator;
     @XmlAttribute

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java Sun Feb
27 14:47:27 2011
@@ -40,7 +40,7 @@ import org.apache.camel.util.concurrent.
  */
 @XmlRootElement(name = "split")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SplitDefinition extends ExpressionNode implements ExecutorServiceAwareDefinition<SplitDefinition>
{
+public class SplitDefinition extends OutputExpressionNode implements ExecutorServiceAwareDefinition<SplitDefinition>
{
     @XmlTransient
     private AggregationStrategy aggregationStrategy;
     @XmlTransient

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java Sun
Feb 27 14:47:27 2011
@@ -30,7 +30,7 @@ import org.apache.camel.spi.RouteContext
  */
 @XmlRootElement(name = "transform")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class TransformDefinition extends NoOutputExpressionNode {
+public class TransformDefinition extends ExpressionNode {
 
     public TransformDefinition() {
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java Sun
Feb 27 14:47:27 2011
@@ -31,7 +31,7 @@ import org.apache.camel.spi.RouteContext
  */
 @XmlRootElement(name = "validate")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ValidateDefinition extends NoOutputExpressionNode {
+public class ValidateDefinition extends ExpressionNode {
 
     public ValidateDefinition() {
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java Sun Feb
27 14:47:27 2011
@@ -30,7 +30,7 @@ import org.apache.camel.spi.RouteContext
  * @version 
  */
 @XmlRootElement(name = "when")
-public class WhenDefinition extends ExpressionNode {
+public class WhenDefinition extends OutputExpressionNode {
 
     public WhenDefinition() {
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
Sun Feb 27 14:47:27 2011
@@ -55,7 +55,7 @@ public class ExpressionDefinition implem
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     @XmlID
     private String id;
-    @XmlValue()
+    @XmlValue
     private String expression;
     @XmlTransient
     private Predicate predicate;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
Sun Feb 27 14:47:27 2011
@@ -33,7 +33,7 @@ import org.apache.camel.Predicate;
 @XmlRootElement(name = "xpath")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class XPathExpression extends NamespaceAwareExpression {
-    @XmlAttribute(required = false)
+    @XmlAttribute
     private Class<?> resultType;
 
     public XPathExpression() {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java?rev=1075067&r1=1075066&r2=1075067&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
Sun Feb 27 14:47:27 2011
@@ -36,7 +36,7 @@ import org.apache.camel.spi.ClassResolve
 @XmlRootElement(name = "xquery")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class XQueryExpression extends NamespaceAwareExpression {
-    @XmlAttribute(required = false)
+    @XmlAttribute
     private String type;
     @XmlTransient
     private Class<?> resultType;



Mime
View raw message