camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r750883 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/model: AggregatorDefinition.java ExceptionDefinition.java ExpressionSubElementType.java SortDefinition.java
Date Fri, 06 Mar 2009 13:06:21 GMT
Author: davsclaus
Date: Fri Mar  6 13:06:21 2009
New Revision: 750883

URL: http://svn.apache.org/viewvc?rev=750883&view=rev
Log:
Fixed hadrians big commit before

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java?rev=750883&r1=750882&r2=750883&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java
Fri Mar  6 13:06:21 2009
@@ -47,7 +47,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 public class AggregatorDefinition extends ProcessorDefinition<AggregatorDefinition>
{
     @XmlElement(name = "correlationExpression", required = false)
-    private ExpressionSubElementDefinition correlationExpression;
+    private ExpressionSubElementType correlationExpression;
     @XmlTransient
     private ExpressionDefinition expression;
     @XmlElementRef
@@ -69,7 +69,7 @@
     @XmlAttribute(required = false)
     private Boolean groupExchanges;
     @XmlElement(name = "completionPredicate", required = false)
-    private ExpressionSubElementDefinition completionPredicate;
+    private ExpressionSubElementType completionPredicate;
 
     public AggregatorDefinition() {
     }
@@ -254,11 +254,11 @@
         this.collectionRef = collectionRef;
     }
 
-    public void setCompletionPredicate(ExpressionSubElementDefinition completionPredicate)
{
+    public void setCompletionPredicate(ExpressionSubElementType completionPredicate) {
         this.completionPredicate = completionPredicate;
     }
 
-    public ExpressionSubElementDefinition getCompletionPredicate() {
+    public ExpressionSubElementType getCompletionPredicate() {
         return completionPredicate;
     }
 
@@ -369,7 +369,7 @@
     public ExpressionClause<AggregatorDefinition> completionPredicate() {
         checkNoCompletedPredicate();
         ExpressionClause<AggregatorDefinition> clause = new ExpressionClause<AggregatorDefinition>(this);
-        setCompletionPredicate(new ExpressionSubElementDefinition((Expression)clause));
+        setCompletionPredicate(new ExpressionSubElementType((Expression)clause));
         return clause;
     }
 
@@ -380,7 +380,7 @@
      */
     public AggregatorDefinition completionPredicate(Predicate predicate) {
         checkNoCompletedPredicate();
-        setCompletionPredicate(new ExpressionSubElementDefinition(predicate));
+        setCompletionPredicate(new ExpressionSubElementType(predicate));
         return this;
     }
 
@@ -390,11 +390,11 @@
         }
     }
 
-    public void setCorrelationExpression(ExpressionSubElementDefinition correlationExpression)
{
+    public void setCorrelationExpression(ExpressionSubElementType correlationExpression)
{
         this.correlationExpression = correlationExpression;
     }
 
-    public ExpressionSubElementDefinition getCorrelationExpression() {
+    public ExpressionSubElementType getCorrelationExpression() {
         return correlationExpression;
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java?rev=750883&r1=750882&r2=750883&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java Fri
Mar  6 13:06:21 2009
@@ -58,11 +58,11 @@
     @XmlElement(name = "onWhen", required = false)
     private WhenDefinition onWhen;
     @XmlElement(name = "retryUntil", required = false)
-    private ExpressionSubElementDefinition retryUntil;
+    private ExpressionSubElementType retryUntil;
     @XmlElement(name = "redeliveryPolicy", required = false)
     private RedeliveryPolicyDefinition redeliveryPolicy;
     @XmlElement(name = "handled", required = false)
-    private ExpressionSubElementDefinition handled;
+    private ExpressionSubElementType handled;
     @XmlAttribute(name = "onRedeliveryRef", required = false)
     private String onRedeliveryRef;
     @XmlElementRef
@@ -397,11 +397,11 @@
         return handledPolicy;
     }
 
-    public void setHandled(ExpressionSubElementDefinition handled) {
+    public void setHandled(ExpressionSubElementType handled) {
         this.handled = handled;
     }
 
-    public ExpressionSubElementDefinition getHandled() {
+    public ExpressionSubElementType getHandled() {
         return handled;
     }    
 
@@ -417,11 +417,11 @@
         this.onWhen = onWhen;
     }
 
-    public ExpressionSubElementDefinition getRetryUntil() {
+    public ExpressionSubElementType getRetryUntil() {
         return retryUntil;
     }
 
-    public void setRetryUntil(ExpressionSubElementDefinition retryUntil) {
+    public void setRetryUntil(ExpressionSubElementType retryUntil) {
         this.retryUntil = retryUntil;
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementType.java?rev=750883&r1=750882&r2=750883&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementType.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementType.java
Fri Mar  6 13:06:21 2009
@@ -24,7 +24,7 @@
 
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
-import org.apache.camel.model.language.ExpressionType;
+import org.apache.camel.model.language.ExpressionDefinition;
 import org.apache.camel.spi.RouteContext;
 
 /**
@@ -34,7 +34,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ExpressionSubElementType {
     @XmlElementRef
-    private ExpressionType expressionType;
+    private ExpressionDefinition expressionType;
     @XmlTransient
     private Expression expression;
     @XmlTransient
@@ -51,11 +51,11 @@
         this.predicate = predicate;
     }   
     
-    public ExpressionType getExpressionType() {
+    public ExpressionDefinition getExpressionType() {
         return expressionType;
     }
 
-    public void setExpressionType(ExpressionType expressionType) {
+    public void setExpressionType(ExpressionDefinition expressionType) {
         this.expressionType = expressionType;
     }
 
@@ -76,7 +76,7 @@
     }    
     
     public Expression createExpression(RouteContext routeContext) {
-        ExpressionType expressionType = getExpressionType();
+        ExpressionDefinition expressionType = getExpressionType();
         if (expressionType != null && expression == null) {
             expression = expressionType.createExpression(routeContext);
         }
@@ -84,7 +84,7 @@
     }
     
     public Predicate createPredicate(RouteContext routeContext) {
-        ExpressionType expressionType = getExpressionType();
+        ExpressionDefinition expressionType = getExpressionType();
         if (expressionType != null && getPredicate() == null) {
             setPredicate(expressionType.createPredicate(routeContext));
         }

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=750883&r1=750882&r2=750883&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 Fri Mar
 6 13:06:21 2009
@@ -44,7 +44,7 @@
     @XmlAttribute(required = false)
     private String comparatorRef;
     @XmlElement(name = "expression", required = false)
-    private ExpressionSubElementDefinition expression;
+    private ExpressionSubElementType expression;
 
     public SortDefinition() {
     }
@@ -125,7 +125,7 @@
     }
 
     public void setExpression(Expression expression) {
-        this.expression = new ExpressionSubElementDefinition(expression);
+        this.expression = new ExpressionSubElementType(expression);
     }
 
     /**



Mime
View raw message