You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/03/08 03:14:09 UTC
svn commit: r751357 [1/2] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/management/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/model/confi...
Author: hadrian
Date: Sun Mar 8 02:14:07 2009
New Revision: 751357
URL: http://svn.apache.org/viewvc?rev=751357&view=rev
Log:
CAMEL-1395. More API renamed for consistency.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AbstractInterceptorDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
- copied, changed from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerDefinition.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherDefinition.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/InterceptorRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerDefinition.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.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/config/StreamResequencerConfig.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/MessageTypeTest.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextRouteBuilderRef.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/routeBuilderRef.xml
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java Sun Mar 8 02:14:07 2009
@@ -267,7 +267,7 @@
}
/**
- * Sets the exception policy strategy to use for resolving the {@link org.apache.camel.model.ExceptionDefinition}
+ * Sets the exception policy strategy to use for resolving the {@link org.apache.camel.model.OnExceptionDefinition}
* to use for a given thrown exception
*/
public ExceptionPolicyStrategy getExceptionPolicyStrategy() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java Sun Mar 8 02:14:07 2009
@@ -19,7 +19,7 @@
import java.util.List;
import org.apache.camel.Processor;
-import org.apache.camel.model.ExceptionDefinition;
+import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.spi.RouteContext;
/**
@@ -43,12 +43,12 @@
* Adds error handler for the given exception type
* @param exception the exception to handle
*/
- void addErrorHandlers(ExceptionDefinition exception);
+ void addErrorHandlers(OnExceptionDefinition exception);
/**
* Adds the error handlers for the given list of exception types
* @param exceptions the list of exceptions to handle
*/
- void setErrorHandlers(List<ExceptionDefinition> exceptions);
+ void setErrorHandlers(List<OnExceptionDefinition> exceptions);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java Sun Mar 8 02:14:07 2009
@@ -19,7 +19,7 @@
import java.util.List;
import org.apache.camel.Processor;
-import org.apache.camel.model.ExceptionDefinition;
+import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@@ -41,7 +41,7 @@
}
@Override
- public void addErrorHandlers(ExceptionDefinition exception) {
+ public void addErrorHandlers(OnExceptionDefinition exception) {
if (handler != null) {
handler.addErrorHandlers(exception);
}
@@ -52,8 +52,8 @@
if (handler == null) {
handler = routeContext.lookup(ref, ErrorHandlerBuilder.class);
ObjectHelper.notNull(handler, "error handler '" + ref + "'");
- List<ExceptionDefinition> list = getExceptions();
- for (ExceptionDefinition exceptionType : list) {
+ List<OnExceptionDefinition> list = getExceptions();
+ for (OnExceptionDefinition exceptionType : list) {
handler.addErrorHandlers(exceptionType);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java Sun Mar 8 02:14:07 2009
@@ -19,7 +19,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.camel.model.ExceptionDefinition;
+import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.processor.ErrorHandlerSupport;
/**
@@ -28,23 +28,23 @@
* @version $Revision$
*/
public abstract class ErrorHandlerBuilderSupport implements ErrorHandlerBuilder {
- private List<ExceptionDefinition> exceptions = new ArrayList<ExceptionDefinition>();
+ private List<OnExceptionDefinition> exceptions = new ArrayList<OnExceptionDefinition>();
- public void addErrorHandlers(ExceptionDefinition exception) {
+ public void addErrorHandlers(OnExceptionDefinition exception) {
exceptions.add(exception);
}
protected void configure(ErrorHandlerSupport handler) {
- for (ExceptionDefinition exception : exceptions) {
+ for (OnExceptionDefinition exception : exceptions) {
handler.addExceptionPolicy(exception);
}
}
- public List<ExceptionDefinition> getExceptions() {
+ public List<OnExceptionDefinition> getExceptions() {
return exceptions;
}
- public void setErrorHandlers(List<ExceptionDefinition> exceptions) {
+ public void setErrorHandlers(List<OnExceptionDefinition> exceptions) {
this.exceptions.clear();
this.exceptions.addAll(exceptions);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Sun Mar 8 02:14:07 2009
@@ -27,7 +27,7 @@
import org.apache.camel.Routes;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.ChoiceDefinition;
-import org.apache.camel.model.ExceptionDefinition;
+import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.model.InterceptDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
@@ -178,7 +178,7 @@
* @param exception exception to catch
* @return the builder
*/
- public ExceptionDefinition onException(Class exception) {
+ public OnExceptionDefinition onException(Class exception) {
return routeCollection.onException(exception);
}
@@ -189,8 +189,8 @@
* @param exceptions list of exceptions to catch
* @return the builder
*/
- public ExceptionDefinition onException(Class... exceptions) {
- ExceptionDefinition last = null;
+ public OnExceptionDefinition onException(Class... exceptions) {
+ OnExceptionDefinition last = null;
for (Class ex : exceptions) {
last = last == null ? onException(ex) : last.onException(ex);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java Sun Mar 8 02:14:07 2009
@@ -33,7 +33,7 @@
import org.apache.camel.Service;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.model.ExceptionDefinition;
+import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.InstrumentationAgent;
@@ -204,7 +204,7 @@
// separate out the exception handers in the outputs
for (ProcessorDefinition output : routeType.getOutputs()) {
- if (output instanceof ExceptionDefinition) {
+ if (output instanceof OnExceptionDefinition) {
exceptionHandlers.add(output);
} else {
outputs.add(output);
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/AbstractInterceptorDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AbstractInterceptorDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/AbstractInterceptorDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/AbstractInterceptorDefinition.java Sun Mar 8 02:14:07 2009
@@ -27,7 +27,7 @@
* @version $Revision$
*/
@XmlType(name = "interceptorType")
-public abstract class InterceptorDefinition extends OutputDefinition implements Block {
+public abstract class AbstractInterceptorDefinition extends OutputDefinition implements Block {
public abstract DelegateProcessor createInterceptor(RouteContext routeContext) throws Exception;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java (from r751293, 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/AggregateDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java&r1=751293&r2=751357&rev=751357&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/AggregateDefinition.java Sun Mar 8 02:14:07 2009
@@ -45,9 +45,9 @@
*/
@XmlRootElement(name = "aggregate")
@XmlAccessorType(XmlAccessType.FIELD)
-public class AggregatorDefinition extends ProcessorDefinition<AggregatorDefinition> {
+public class AggregateDefinition extends ProcessorDefinition<AggregateDefinition> {
@XmlElement(name = "correlationExpression", required = false)
- private ExpressionSubElementType correlationExpression;
+ private ExpressionSubElementDefinition correlationExpression;
@XmlTransient
private ExpressionDefinition expression;
@XmlElementRef
@@ -69,28 +69,28 @@
@XmlAttribute(required = false)
private Boolean groupExchanges;
@XmlElement(name = "completionPredicate", required = false)
- private ExpressionSubElementType completionPredicate;
+ private ExpressionSubElementDefinition completionPredicate;
- public AggregatorDefinition() {
+ public AggregateDefinition() {
}
- public AggregatorDefinition(Predicate predicate) {
+ public AggregateDefinition(Predicate predicate) {
if (predicate != null) {
setExpression(new ExpressionDefinition(predicate));
}
}
- public AggregatorDefinition(Expression correlationExpression) {
+ public AggregateDefinition(Expression correlationExpression) {
if (correlationExpression != null) {
setExpression(new ExpressionDefinition(correlationExpression));
}
}
- public AggregatorDefinition(ExpressionDefinition correlationExpression) {
+ public AggregateDefinition(ExpressionDefinition correlationExpression) {
this.expression = correlationExpression;
}
- public AggregatorDefinition(Expression correlationExpression, AggregationStrategy aggregationStrategy) {
+ public AggregateDefinition(Expression correlationExpression, AggregationStrategy aggregationStrategy) {
this(correlationExpression);
this.aggregationStrategy = aggregationStrategy;
}
@@ -111,8 +111,8 @@
return createAggregator(routeContext);
}
- public ExpressionClause<AggregatorDefinition> createAndSetExpression() {
- ExpressionClause<AggregatorDefinition> clause = new ExpressionClause<AggregatorDefinition>(this);
+ public ExpressionClause<AggregateDefinition> createAndSetExpression() {
+ ExpressionClause<AggregateDefinition> clause = new ExpressionClause<AggregateDefinition>(this);
this.setExpression(clause);
return clause;
}
@@ -254,11 +254,11 @@
this.collectionRef = collectionRef;
}
- public void setCompletionPredicate(ExpressionSubElementType completionPredicate) {
+ public void setCompletionPredicate(ExpressionSubElementDefinition completionPredicate) {
this.completionPredicate = completionPredicate;
}
- public ExpressionSubElementType getCompletionPredicate() {
+ public ExpressionSubElementDefinition getCompletionPredicate() {
return completionPredicate;
}
@@ -279,7 +279,7 @@
* @param batchSize the batch size
* @return builder
*/
- public AggregatorDefinition batchSize(int batchSize) {
+ public AggregateDefinition batchSize(int batchSize) {
setBatchSize(batchSize);
return this;
}
@@ -290,7 +290,7 @@
* @param batchSize the batch size
* @return builder
*/
- public AggregatorDefinition outBatchSize(int batchSize) {
+ public AggregateDefinition outBatchSize(int batchSize) {
setOutBatchSize(batchSize);
return this;
}
@@ -301,7 +301,7 @@
* @param batchTimeout the timeout in millis
* @return the builder
*/
- public AggregatorDefinition batchTimeout(long batchTimeout) {
+ public AggregateDefinition batchTimeout(long batchTimeout) {
setBatchTimeout(batchTimeout);
return this;
}
@@ -312,7 +312,7 @@
* @param aggregationCollection the aggregate collection to use
* @return the builder
*/
- public AggregatorDefinition aggregationCollection(AggregationCollection aggregationCollection) {
+ public AggregateDefinition aggregationCollection(AggregationCollection aggregationCollection) {
setAggregationCollection(aggregationCollection);
return this;
}
@@ -323,7 +323,7 @@
* @param aggregationStrategy the aggregate strategy to use
* @return the builder
*/
- public AggregatorDefinition aggregationStrategy(AggregationStrategy aggregationStrategy) {
+ public AggregateDefinition aggregationStrategy(AggregationStrategy aggregationStrategy) {
setAggregationStrategy(aggregationStrategy);
return this;
}
@@ -334,7 +334,7 @@
* @param collectionRef reference to the aggregate collection to lookup in the registry
* @return the builder
*/
- public AggregatorDefinition collectionRef(String collectionRef) {
+ public AggregateDefinition collectionRef(String collectionRef) {
setCollectionRef(collectionRef);
return this;
}
@@ -345,7 +345,7 @@
* @param strategyRef reference to the strategy to lookup in the registry
* @return the builder
*/
- public AggregatorDefinition strategyRef(String strategyRef) {
+ public AggregateDefinition strategyRef(String strategyRef) {
setStrategyRef(strategyRef);
return this;
}
@@ -356,7 +356,7 @@
*
* @return the builder
*/
- public AggregatorDefinition groupExchanges() {
+ public AggregateDefinition groupExchanges() {
setGroupExchanges(true);
return this;
}
@@ -366,10 +366,10 @@
*
* @return the clause used to create the predicate
*/
- public ExpressionClause<AggregatorDefinition> completionPredicate() {
+ public ExpressionClause<AggregateDefinition> completionPredicate() {
checkNoCompletedPredicate();
- ExpressionClause<AggregatorDefinition> clause = new ExpressionClause<AggregatorDefinition>(this);
- setCompletionPredicate(new ExpressionSubElementType((Expression)clause));
+ ExpressionClause<AggregateDefinition> clause = new ExpressionClause<AggregateDefinition>(this);
+ setCompletionPredicate(new ExpressionSubElementDefinition((Expression)clause));
return clause;
}
@@ -378,9 +378,9 @@
*
* @param predicate the predicate
*/
- public AggregatorDefinition completionPredicate(Predicate predicate) {
+ public AggregateDefinition completionPredicate(Predicate predicate) {
checkNoCompletedPredicate();
- setCompletionPredicate(new ExpressionSubElementType(predicate));
+ setCompletionPredicate(new ExpressionSubElementDefinition(predicate));
return this;
}
@@ -390,11 +390,11 @@
}
}
- public void setCorrelationExpression(ExpressionSubElementType correlationExpression) {
+ public void setCorrelationExpression(ExpressionSubElementDefinition correlationExpression) {
this.correlationExpression = correlationExpression;
}
- public ExpressionSubElementType getCorrelationExpression() {
+ public ExpressionSubElementDefinition getCorrelationExpression() {
return correlationExpression;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java Sun Mar 8 02:14:07 2009
@@ -36,24 +36,24 @@
*/
@XmlRootElement(name = "bean")
@XmlAccessorType(XmlAccessType.FIELD)
-public class BeanRef extends OutputDefinition<ProcessorDefinition> {
+public class BeanDefinition extends OutputDefinition<ProcessorDefinition> {
@XmlAttribute(required = false)
private String ref;
@XmlAttribute(required = false)
private String method;
@XmlAttribute(required = false)
- private Class beanType;
+ private Class<?> beanType;
@XmlTransient
private Object bean;
- public BeanRef() {
+ public BeanDefinition() {
}
- public BeanRef(String ref) {
+ public BeanDefinition(String ref) {
this.ref = ref;
}
- public BeanRef(String ref, String method) {
+ public BeanDefinition(String ref, String method) {
this.ref = ref;
this.method = method;
}
@@ -104,7 +104,7 @@
* @param ref the bean's id in the registry
* @return the builder
*/
- public BeanRef ref(String ref) {
+ public BeanDefinition ref(String ref) {
setRef(ref);
return this;
}
@@ -115,7 +115,7 @@
* @param method the bean's method name which wants camel to call
* @return the builder
*/
- public BeanRef method(String method) {
+ public BeanDefinition method(String method) {
setMethod(method);
return this;
}
@@ -126,7 +126,7 @@
* @param bean the instance of the bean
* @return the builder
*/
- public BeanRef bean(Object bean) {
+ public BeanDefinition bean(Object bean) {
setBean(bean);
return this;
}
@@ -137,7 +137,7 @@
* @param beanType the Class of the bean
* @return the builder
*/
- public BeanRef beanType(Class beanType) {
+ public BeanDefinition beanType(Class beanType) {
setBean(beanType);
return this;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerDefinition.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerDefinition.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java Sun Mar 8 02:14:07 2009
@@ -36,22 +36,22 @@
*/
@XmlRootElement(name = "delay")
@XmlAccessorType(XmlAccessType.FIELD)
-public class DelayerDefinition extends ExpressionNode {
+public class DelayDefinition extends ExpressionNode {
@XmlAttribute
private Long delayTime = 0L;
- public DelayerDefinition() {
+ public DelayDefinition() {
}
- public DelayerDefinition(Expression processAtExpression) {
+ public DelayDefinition(Expression processAtExpression) {
super(processAtExpression);
}
- public DelayerDefinition(ExpressionDefinition processAtExpression) {
+ public DelayDefinition(ExpressionDefinition processAtExpression) {
super(processAtExpression);
}
- public DelayerDefinition(Expression processAtExpression, long delayTime) {
+ public DelayDefinition(Expression processAtExpression, long delayTime) {
super(processAtExpression);
this.delayTime = delayTime;
}
@@ -69,7 +69,7 @@
* @param delay delay time in millis
* @return the builder
*/
- public DelayerDefinition delayTime(Long delay) {
+ public DelayDefinition delayTime(Long delay) {
setDelayTime(delay);
return this;
}
@@ -78,7 +78,7 @@
* Set the expression that the delayer will use
* @return the builder
*/
- public ExpressionClause<DelayerDefinition> expression() {
+ public ExpressionClause<DelayDefinition> expression() {
return ExpressionClause.createAndSetExpression(this);
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherDefinition.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherDefinition.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java Sun Mar 8 02:14:07 2009
@@ -33,7 +33,7 @@
*/
@XmlRootElement(name = "enrich")
@XmlAccessorType(XmlAccessType.FIELD)
-public class EnricherDefinition extends OutputDefinition<EnricherDefinition> {
+public class EnrichDefinition extends OutputDefinition<EnrichDefinition> {
@XmlAttribute(name = "uri", required = true)
private String resourceUri;
@@ -44,15 +44,15 @@
@XmlTransient
private AggregationStrategy aggregationStrategy;
- public EnricherDefinition() {
+ public EnrichDefinition() {
this(null, null);
}
- public EnricherDefinition(String resourceUri) {
+ public EnrichDefinition(String resourceUri) {
this(null, resourceUri);
}
- public EnricherDefinition(AggregationStrategy aggregationStrategy, String resourceUri) {
+ public EnrichDefinition(AggregationStrategy aggregationStrategy, String resourceUri) {
this.aggregationStrategy = aggregationStrategy;
this.resourceUri = resourceUri;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java (from r751293, 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/ExpressionSubElementDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementType.java&r1=751293&r2=751357&rev=751357&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/ExpressionSubElementDefinition.java Sun Mar 8 02:14:07 2009
@@ -32,7 +32,7 @@
*/
@XmlRootElement(name = "expression")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ExpressionSubElementType {
+public class ExpressionSubElementDefinition {
@XmlElementRef
private ExpressionDefinition expressionType;
@XmlTransient
@@ -40,14 +40,14 @@
@XmlTransient
private Predicate predicate;
- public ExpressionSubElementType() {
+ public ExpressionSubElementDefinition() {
}
- public ExpressionSubElementType(Expression expression) {
+ public ExpressionSubElementDefinition(Expression expression) {
this.expression = expression;
}
- public ExpressionSubElementType(Predicate predicate) {
+ public ExpressionSubElementDefinition(Predicate predicate) {
this.predicate = predicate;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultDefinition.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultDefinition.java Sun Mar 8 02:14:07 2009
@@ -29,7 +29,7 @@
*/
@XmlRootElement(name = "handleFault")
@XmlAccessorType(XmlAccessType.FIELD)
-public class HandleFaultDefinition extends InterceptorRef {
+public class HandleFaultDefinition extends InterceptorDefinition {
public HandleFaultDefinition() {
super(new HandleFaultProcessor());
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java Sun Mar 8 02:14:07 2009
@@ -34,20 +34,20 @@
*/
@XmlRootElement(name = "interceptor")
@XmlAccessorType(XmlAccessType.FIELD)
-public class InterceptorRef extends InterceptorDefinition {
+public class InterceptorDefinition extends AbstractInterceptorDefinition {
@XmlAttribute(required = true)
private String ref;
@XmlTransient
private DelegateProcessor interceptor;
- public InterceptorRef() {
+ public InterceptorDefinition() {
}
- public InterceptorRef(String ref) {
+ public InterceptorDefinition(String ref) {
setRef(ref);
}
- public InterceptorRef(DelegateProcessor interceptor) {
+ public InterceptorDefinition(DelegateProcessor interceptor) {
this.interceptor = interceptor;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java (from r751293, 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/OnExceptionDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java&r1=751293&r2=751357&rev=751357&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/OnExceptionDefinition.java Sun Mar 8 02:14:07 2009
@@ -51,18 +51,18 @@
*/
@XmlRootElement(name = "onException")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ExceptionDefinition extends ProcessorDefinition<ProcessorDefinition> {
+public class OnExceptionDefinition extends ProcessorDefinition<ProcessorDefinition> {
@XmlElement(name = "exception")
private List<String> exceptions = new ArrayList<String>();
@XmlElement(name = "onWhen", required = false)
private WhenDefinition onWhen;
@XmlElement(name = "retryUntil", required = false)
- private ExpressionSubElementType retryUntil;
+ private ExpressionSubElementDefinition retryUntil;
@XmlElement(name = "redeliveryPolicy", required = false)
private RedeliveryPolicyDefinition redeliveryPolicy;
@XmlElement(name = "handled", required = false)
- private ExpressionSubElementType handled;
+ private ExpressionSubElementDefinition handled;
@XmlAttribute(name = "onRedeliveryRef", required = false)
private String onRedeliveryRef;
@XmlElementRef
@@ -78,14 +78,14 @@
@XmlTransient
private Processor onRedelivery;
- public ExceptionDefinition() {
+ public OnExceptionDefinition() {
}
- public ExceptionDefinition(List<Class> exceptionClasses) {
+ public OnExceptionDefinition(List<Class> exceptionClasses) {
this.exceptionClasses = exceptionClasses;
}
- public ExceptionDefinition(Class exceptionType) {
+ public OnExceptionDefinition(Class exceptionType) {
exceptionClasses = new ArrayList<Class>();
exceptionClasses.add(exceptionType);
}
@@ -139,7 +139,7 @@
//-------------------------------------------------------------------------
@Override
- public ExceptionDefinition onException(Class exceptionType) {
+ public OnExceptionDefinition onException(Class exceptionType) {
getExceptionClasses().add(exceptionType);
return this;
}
@@ -150,7 +150,7 @@
* @param handled handled or not
* @return the builder
*/
- public ExceptionDefinition handled(boolean handled) {
+ public OnExceptionDefinition handled(boolean handled) {
ConstantLanguage constant = new ConstantLanguage();
return handled(constant.createPredicate(Boolean.toString(handled)));
}
@@ -161,7 +161,7 @@
* @param handled predicate that determines true or false
* @return the builder
*/
- public ExceptionDefinition handled(Predicate handled) {
+ public OnExceptionDefinition handled(Predicate handled) {
setHandledPolicy(handled);
return this;
}
@@ -172,7 +172,7 @@
* @param handled expression that determines true or false
* @return the builder
*/
- public ExceptionDefinition handled(Expression handled) {
+ public OnExceptionDefinition handled(Expression handled) {
setHandledPolicy(toPredicate(handled));
return this;
}
@@ -186,7 +186,7 @@
* @param predicate predicate that determines true or false
* @return the builder
*/
- public ExceptionDefinition onWhen(Predicate predicate) {
+ public OnExceptionDefinition onWhen(Predicate predicate) {
setOnWhen(new WhenDefinition(predicate));
return this;
}
@@ -200,9 +200,9 @@
*
* @return the expression clause to configure
*/
- public ExpressionClause<ExceptionDefinition> onWhen() {
+ public ExpressionClause<OnExceptionDefinition> onWhen() {
onWhen = new WhenDefinition();
- ExpressionClause<ExceptionDefinition> clause = new ExpressionClause<ExceptionDefinition>(this);
+ ExpressionClause<OnExceptionDefinition> clause = new ExpressionClause<OnExceptionDefinition>(this);
onWhen.setExpression(clause);
return clause;
}
@@ -213,7 +213,7 @@
* @param until predicate that determines when to stop retrying
* @return the builder
*/
- public ExceptionDefinition retryUntil(Predicate until) {
+ public OnExceptionDefinition retryUntil(Predicate until) {
setRetryUntilPolicy(until);
return this;
}
@@ -224,7 +224,7 @@
* @param until expression that determines when to stop retrying
* @return the builder
*/
- public ExceptionDefinition retryUntil(Expression until) {
+ public OnExceptionDefinition retryUntil(Expression until) {
setRetryUntilPolicy(toPredicate(until));
return this;
}
@@ -235,7 +235,7 @@
* @param backOffMultiplier the back off multiplier
* @return the builder
*/
- public ExceptionDefinition backOffMultiplier(double backOffMultiplier) {
+ public OnExceptionDefinition backOffMultiplier(double backOffMultiplier) {
getOrCreateRedeliveryPolicy().backOffMultiplier(backOffMultiplier);
return this;
}
@@ -246,7 +246,7 @@
* @param collisionAvoidanceFactor the factor
* @return the builder
*/
- public ExceptionDefinition collisionAvoidanceFactor(double collisionAvoidanceFactor) {
+ public OnExceptionDefinition collisionAvoidanceFactor(double collisionAvoidanceFactor) {
getOrCreateRedeliveryPolicy().collisionAvoidanceFactor(collisionAvoidanceFactor);
return this;
}
@@ -257,7 +257,7 @@
* @param collisionAvoidancePercent the percentage
* @return the builder
*/
- public ExceptionDefinition collisionAvoidancePercent(short collisionAvoidancePercent) {
+ public OnExceptionDefinition collisionAvoidancePercent(short collisionAvoidancePercent) {
getOrCreateRedeliveryPolicy().collisionAvoidancePercent(collisionAvoidancePercent);
return this;
}
@@ -268,7 +268,7 @@
* @param delay delay in millis
* @return the builder
*/
- public ExceptionDefinition redeliveryDelay(long delay) {
+ public OnExceptionDefinition redeliveryDelay(long delay) {
getOrCreateRedeliveryPolicy().redeliveryDelay(delay);
return this;
}
@@ -279,7 +279,7 @@
* @param retriesExhaustedLogLevel the logging level
* @return the builder
*/
- public ExceptionDefinition retriesExhaustedLogLevel(LoggingLevel retriesExhaustedLogLevel) {
+ public OnExceptionDefinition retriesExhaustedLogLevel(LoggingLevel retriesExhaustedLogLevel) {
getOrCreateRedeliveryPolicy().retriesExhaustedLogLevel(retriesExhaustedLogLevel);
return this;
}
@@ -290,7 +290,7 @@
* @param retryAttemptedLogLevel the logging level
* @return the builder
*/
- public ExceptionDefinition retryAttemptedLogLevel(LoggingLevel retryAttemptedLogLevel) {
+ public OnExceptionDefinition retryAttemptedLogLevel(LoggingLevel retryAttemptedLogLevel) {
getOrCreateRedeliveryPolicy().retryAttemptedLogLevel(retryAttemptedLogLevel);
return this;
}
@@ -306,7 +306,7 @@
* @param maximumRedeliveries the value
* @return the builder
*/
- public ExceptionDefinition maximumRedeliveries(int maximumRedeliveries) {
+ public OnExceptionDefinition maximumRedeliveries(int maximumRedeliveries) {
getOrCreateRedeliveryPolicy().maximumRedeliveries(maximumRedeliveries);
return this;
}
@@ -316,7 +316,7 @@
*
* @return the builder
*/
- public ExceptionDefinition useCollisionAvoidance() {
+ public OnExceptionDefinition useCollisionAvoidance() {
getOrCreateRedeliveryPolicy().useCollisionAvoidance();
return this;
}
@@ -326,7 +326,7 @@
*
* @return the builder
*/
- public ExceptionDefinition useExponentialBackOff() {
+ public OnExceptionDefinition useExponentialBackOff() {
getOrCreateRedeliveryPolicy().useExponentialBackOff();
return this;
}
@@ -337,7 +337,7 @@
* @param maximumRedeliveryDelay the delay in millis
* @return the builder
*/
- public ExceptionDefinition maximumRedeliveryDelay(long maximumRedeliveryDelay) {
+ public OnExceptionDefinition maximumRedeliveryDelay(long maximumRedeliveryDelay) {
getOrCreateRedeliveryPolicy().maximumRedeliveryDelay(maximumRedeliveryDelay);
return this;
}
@@ -347,7 +347,7 @@
* <p/>
* Can be used to change the {@link org.apache.camel.Exchange} <b>before</b> its being redelivered.
*/
- public ExceptionDefinition onRedelivery(Processor processor) {
+ public OnExceptionDefinition onRedelivery(Processor processor) {
setOnRedelivery(processor);
return this;
}
@@ -397,11 +397,11 @@
return handledPolicy;
}
- public void setHandled(ExpressionSubElementType handled) {
+ public void setHandled(ExpressionSubElementDefinition handled) {
this.handled = handled;
}
- public ExpressionSubElementType getHandled() {
+ public ExpressionSubElementDefinition getHandled() {
return handled;
}
@@ -417,11 +417,11 @@
this.onWhen = onWhen;
}
- public ExpressionSubElementType getRetryUntil() {
+ public ExpressionSubElementDefinition getRetryUntil() {
return retryUntil;
}
- public void setRetryUntil(ExpressionSubElementType retryUntil) {
+ public void setRetryUntil(ExpressionSubElementDefinition retryUntil) {
this.retryUntil = retryUntil;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java Sun Mar 8 02:14:07 2009
@@ -34,16 +34,16 @@
*/
@XmlRootElement(name = "policy")
@XmlAccessorType(XmlAccessType.FIELD)
-public class PolicyRef extends OutputDefinition<ProcessorDefinition> {
+public class PolicyDefinition extends OutputDefinition<ProcessorDefinition> {
@XmlAttribute(required = true)
private String ref;
@XmlTransient
private Policy policy;
- public PolicyRef() {
+ public PolicyDefinition() {
}
- public PolicyRef(Policy policy) {
+ public PolicyDefinition(Policy policy) {
this.policy = policy;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java Sun Mar 8 02:14:07 2009
@@ -33,16 +33,16 @@
*/
@XmlRootElement(name = "process")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ProcessorRef extends OutputDefinition<ProcessorDefinition> {
+public class ProcessDefinition extends OutputDefinition<ProcessorDefinition> {
@XmlAttribute(required = true)
private String ref;
@XmlTransient
private Processor processor;
- public ProcessorRef() {
+ public ProcessDefinition() {
}
- public ProcessorRef(Processor processor) {
+ public ProcessDefinition(Processor processor) {
this.processor = processor;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Sun Mar 8 02:14:07 2009
@@ -79,7 +79,7 @@
private NodeFactory nodeFactory;
private LinkedList<Block> blocks = new LinkedList<Block>();
private ProcessorDefinition parent;
- private List<InterceptorDefinition> interceptors = new ArrayList<InterceptorDefinition>();
+ private List<AbstractInterceptorDefinition> interceptors = new ArrayList<AbstractInterceptorDefinition>();
private String errorHandlerRef;
// else to use an optional attribute in JAXB2
@@ -759,8 +759,8 @@
*
* @return the expression clause builder for the expression on which to split
*/
- public ExpressionClause<SplitterDefinition> split() {
- SplitterDefinition answer = new SplitterDefinition();
+ public ExpressionClause<SplitDefinition> split() {
+ SplitDefinition answer = new SplitDefinition();
addOutput(answer);
return ExpressionClause.createAndSetExpression(answer);
}
@@ -775,8 +775,8 @@
* @param expression the expression on which to split the message
* @return the builder
*/
- public SplitterDefinition split(Expression expression) {
- SplitterDefinition answer = new SplitterDefinition(expression);
+ public SplitDefinition split(Expression expression) {
+ SplitDefinition answer = new SplitDefinition(expression);
addOutput(answer);
return answer;
}
@@ -791,8 +791,8 @@
* @param aggregationStrategy the strategy used to aggregate responses for every part
* @return the builder
*/
- public SplitterDefinition split(Expression expression, AggregationStrategy aggregationStrategy) {
- SplitterDefinition answer = new SplitterDefinition(expression);
+ public SplitDefinition split(Expression expression, AggregationStrategy aggregationStrategy) {
+ SplitDefinition answer = new SplitDefinition(expression);
addOutput(answer);
answer.setAggregationStrategy(aggregationStrategy);
return answer;
@@ -804,10 +804,10 @@
*
* @return the expression clause for the expressions on which to compare messages in order
*/
- public ExpressionClause<ResequencerDefinition> resequence() {
- ResequencerDefinition answer = new ResequencerDefinition();
+ public ExpressionClause<ResequenceDefinition> resequence() {
+ ResequenceDefinition answer = new ResequenceDefinition();
addOutput(answer);
- ExpressionClause<ResequencerDefinition> clause = new ExpressionClause<ResequencerDefinition>(answer);
+ ExpressionClause<ResequenceDefinition> clause = new ExpressionClause<ResequenceDefinition>(answer);
answer.expression(clause);
return clause;
}
@@ -819,7 +819,7 @@
* @param expression the expression on which to compare messages in order
* @return the builder
*/
- public ResequencerDefinition resequence(Expression expression) {
+ public ResequenceDefinition resequence(Expression expression) {
return resequence(Collections.<Expression>singletonList(expression));
}
@@ -830,8 +830,8 @@
* @param expressions the list of expressions on which to compare messages in order
* @return the builder
*/
- public ResequencerDefinition resequence(List<Expression> expressions) {
- ResequencerDefinition answer = new ResequencerDefinition(expressions);
+ public ResequenceDefinition resequence(List<Expression> expressions) {
+ ResequenceDefinition answer = new ResequenceDefinition(expressions);
addOutput(answer);
return answer;
}
@@ -843,7 +843,7 @@
* @param expressions the list of expressions on which to compare messages in order
* @return the builder
*/
- public ResequencerDefinition resequencer(Expression... expressions) {
+ public ResequenceDefinition resequencer(Expression... expressions) {
List<Expression> list = new ArrayList<Expression>();
list.addAll(Arrays.asList(expressions));
return resequence(list);
@@ -855,8 +855,8 @@
*
* @return the expression clause to be used as builder to configure the correlation expression
*/
- public ExpressionClause<AggregatorDefinition> aggregate() {
- AggregatorDefinition answer = new AggregatorDefinition();
+ public ExpressionClause<AggregateDefinition> aggregate() {
+ AggregateDefinition answer = new AggregateDefinition();
addOutput(answer);
return answer.createAndSetExpression();
}
@@ -868,8 +868,8 @@
* @param aggregationStrategy the strategy used for the aggregation
* @return the expression clause to be used as builder to configure the correlation expression
*/
- public ExpressionClause<AggregatorDefinition> aggregate(AggregationStrategy aggregationStrategy) {
- AggregatorDefinition answer = new AggregatorDefinition();
+ public ExpressionClause<AggregateDefinition> aggregate(AggregationStrategy aggregationStrategy) {
+ AggregateDefinition answer = new AggregateDefinition();
answer.setAggregationStrategy(aggregationStrategy);
addOutput(answer);
return answer.createAndSetExpression();
@@ -882,8 +882,8 @@
* @param aggregationCollection the collection used to perform the aggregation
* @return the builder
*/
- public AggregatorDefinition aggregate(AggregationCollection aggregationCollection) {
- AggregatorDefinition answer = new AggregatorDefinition();
+ public AggregateDefinition aggregate(AggregationCollection aggregationCollection) {
+ AggregateDefinition answer = new AggregateDefinition();
answer.setAggregationCollection(aggregationCollection);
addOutput(answer);
return answer;
@@ -899,8 +899,8 @@
* <code>header("JMSCorrelationID")</code>
* @return the builder
*/
- public AggregatorDefinition aggregate(Expression correlationExpression) {
- AggregatorDefinition answer = new AggregatorDefinition(correlationExpression);
+ public AggregateDefinition aggregate(Expression correlationExpression) {
+ AggregateDefinition answer = new AggregateDefinition(correlationExpression);
addOutput(answer);
return answer;
}
@@ -916,8 +916,8 @@
* @param aggregationStrategy the strategy used for the aggregation
* @return the builder
*/
- public AggregatorDefinition aggregate(Expression correlationExpression, AggregationStrategy aggregationStrategy) {
- AggregatorDefinition answer = new AggregatorDefinition(correlationExpression, aggregationStrategy);
+ public AggregateDefinition aggregate(Expression correlationExpression, AggregationStrategy aggregationStrategy) {
+ AggregateDefinition answer = new AggregateDefinition(correlationExpression, aggregationStrategy);
addOutput(answer);
return answer;
}
@@ -930,7 +930,7 @@
* should be convertable to long as time in millis
* @return the builder
*/
- public DelayerDefinition delay(Expression processAtExpression) {
+ public DelayDefinition delay(Expression processAtExpression) {
return delay(processAtExpression, 0L);
}
@@ -943,8 +943,8 @@
* @param delay the delay in milliseconds which is added to the processAtExpression
* @return the builder
*/
- public DelayerDefinition delay(Expression processAtExpression, long delay) {
- DelayerDefinition answer = new DelayerDefinition(processAtExpression, delay);
+ public DelayDefinition delay(Expression processAtExpression, long delay) {
+ DelayDefinition answer = new DelayDefinition(processAtExpression, delay);
addOutput(answer);
return answer;
}
@@ -955,8 +955,8 @@
*
* @return the expression clause to create the expression
*/
- public ExpressionClause<DelayerDefinition> delay() {
- DelayerDefinition answer = new DelayerDefinition();
+ public ExpressionClause<DelayDefinition> delay() {
+ DelayDefinition answer = new DelayDefinition();
addOutput(answer);
return ExpressionClause.createAndSetExpression(answer);
}
@@ -968,7 +968,7 @@
* @param delay the default delay in millis
* @return the builder
*/
- public DelayerDefinition delay(long delay) {
+ public DelayDefinition delay(long delay) {
return delay(null, delay);
}
@@ -983,8 +983,8 @@
* @param maximumRequestCount the maximum messages
* @return the builder
*/
- public ThrottlerDefinition throttle(long maximumRequestCount) {
- ThrottlerDefinition answer = new ThrottlerDefinition(maximumRequestCount);
+ public ThrottleDefinition throttle(long maximumRequestCount) {
+ ThrottleDefinition answer = new ThrottleDefinition(maximumRequestCount);
addOutput(answer);
return answer;
}
@@ -1064,7 +1064,7 @@
*/
@SuppressWarnings("unchecked")
public Type interceptor(String ref) {
- InterceptorRef interceptor = new InterceptorRef(ref);
+ InterceptorDefinition interceptor = new InterceptorDefinition(ref);
intercept(interceptor);
return (Type) this;
}
@@ -1092,7 +1092,7 @@
*/
@SuppressWarnings("unchecked")
public Type intercept(DelegateProcessor interceptor) {
- intercept(new InterceptorRef(interceptor));
+ intercept(new InterceptorDefinition(interceptor));
return (Type) this;
}
@@ -1112,7 +1112,7 @@
*
* @param interceptor the interceptor
*/
- public void intercept(InterceptorDefinition interceptor) {
+ public void intercept(AbstractInterceptorDefinition interceptor) {
addOutput(interceptor);
pushBlock(interceptor);
}
@@ -1122,7 +1122,7 @@
*
* @param interceptor the interceptor
*/
- public void addInterceptor(InterceptorDefinition interceptor) {
+ public void addInterceptor(AbstractInterceptorDefinition interceptor) {
interceptors.add(interceptor);
}
@@ -1132,7 +1132,7 @@
* @param interceptor the interceptor
*/
public void addInterceptor(DelegateProcessor interceptor) {
- addInterceptor(new InterceptorRef(interceptor));
+ addInterceptor(new InterceptorDefinition(interceptor));
}
/**
@@ -1227,8 +1227,8 @@
* @param exceptionType the exception to catch
* @return the exception builder to configure
*/
- public ExceptionDefinition onException(Class exceptionType) {
- ExceptionDefinition answer = new ExceptionDefinition(exceptionType);
+ public OnExceptionDefinition onException(Class exceptionType) {
+ OnExceptionDefinition answer = new OnExceptionDefinition(exceptionType);
addOutput(answer);
return answer;
}
@@ -1252,8 +1252,8 @@
*
* @return the policy builder to configure
*/
- public PolicyRef policies() {
- PolicyRef answer = new PolicyRef();
+ public PolicyDefinition policies() {
+ PolicyDefinition answer = new PolicyDefinition();
addOutput(answer);
return answer;
}
@@ -1266,8 +1266,8 @@
* @param policy the policy to apply
* @return the policy builder to configure
*/
- public PolicyRef policy(Policy policy) {
- PolicyRef answer = new PolicyRef(policy);
+ public PolicyDefinition policy(Policy policy) {
+ PolicyDefinition answer = new PolicyDefinition(policy);
addOutput(answer);
return answer;
}
@@ -1321,7 +1321,7 @@
*/
@SuppressWarnings("unchecked")
public Type process(Processor processor) {
- ProcessorRef answer = new ProcessorRef(processor);
+ ProcessDefinition answer = new ProcessDefinition(processor);
addOutput(answer);
return (Type) this;
}
@@ -1336,7 +1336,7 @@
*/
@SuppressWarnings("unchecked")
public Type processRef(String ref) {
- ProcessorRef answer = new ProcessorRef();
+ ProcessDefinition answer = new ProcessDefinition();
answer.setRef(ref);
addOutput(answer);
return (Type) this;
@@ -1351,7 +1351,7 @@
*/
@SuppressWarnings("unchecked")
public Type bean(Object bean) {
- BeanRef answer = new BeanRef();
+ BeanDefinition answer = new BeanDefinition();
answer.setBean(bean);
addOutput(answer);
return (Type) this;
@@ -1367,7 +1367,7 @@
*/
@SuppressWarnings("unchecked")
public Type bean(Object bean, String method) {
- BeanRef answer = new BeanRef();
+ BeanDefinition answer = new BeanDefinition();
answer.setBean(bean);
answer.setMethod(method);
addOutput(answer);
@@ -1383,7 +1383,7 @@
*/
@SuppressWarnings("unchecked")
public Type bean(Class beanType) {
- BeanRef answer = new BeanRef();
+ BeanDefinition answer = new BeanDefinition();
answer.setBeanType(beanType);
addOutput(answer);
return (Type) this;
@@ -1399,7 +1399,7 @@
*/
@SuppressWarnings("unchecked")
public Type bean(Class beanType, String method) {
- BeanRef answer = new BeanRef();
+ BeanDefinition answer = new BeanDefinition();
answer.setBeanType(beanType);
answer.setMethod(method);
addOutput(answer);
@@ -1415,7 +1415,7 @@
*/
@SuppressWarnings("unchecked")
public Type beanRef(String ref) {
- BeanRef answer = new BeanRef(ref);
+ BeanDefinition answer = new BeanDefinition(ref);
addOutput(answer);
return (Type) this;
}
@@ -1430,7 +1430,7 @@
*/
@SuppressWarnings("unchecked")
public Type beanRef(String ref, String method) {
- BeanRef answer = new BeanRef(ref, method);
+ BeanDefinition answer = new BeanDefinition(ref, method);
addOutput(answer);
return (Type) this;
}
@@ -1712,7 +1712,7 @@
*/
@SuppressWarnings("unchecked")
public Type enrich(String resourceUri, AggregationStrategy aggregationStrategy) {
- addOutput(new EnricherDefinition(aggregationStrategy, resourceUri));
+ addOutput(new EnrichDefinition(aggregationStrategy, resourceUri));
return (Type)this;
}
@@ -1946,7 +1946,7 @@
}
}
- List<InterceptorDefinition> list = routeContext.getRoute().getInterceptors();
+ List<AbstractInterceptorDefinition> list = routeContext.getRoute().getInterceptors();
if (interceptors != null) {
list.addAll(interceptors);
}
@@ -1954,7 +1954,7 @@
Collections.reverse(list);
Set<Processor> interceptors = new HashSet<Processor>();
interceptors.add(target);
- for (InterceptorDefinition interceptorType : list) {
+ for (AbstractInterceptorDefinition interceptorType : list) {
DelegateProcessor interceptor = interceptorType.createInterceptor(routeContext);
if (!interceptors.contains(interceptor)) {
interceptors.add(interceptor);
@@ -2033,7 +2033,7 @@
processor = output.wrapProcessorInInterceptors(routeContext, processor);
ProcessorDefinition currentProcessor = this;
- if (!(currentProcessor instanceof ExceptionDefinition || currentProcessor instanceof TryDefinition)) {
+ if (!(currentProcessor instanceof OnExceptionDefinition || currentProcessor instanceof TryDefinition)) {
processor = output.wrapInErrorHandler(routeContext, processor);
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerDefinition.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerDefinition.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java Sun Mar 8 02:14:07 2009
@@ -40,7 +40,7 @@
* @version $Revision$
*/
@XmlRootElement(name = "resequence")
-public class ResequencerDefinition extends ProcessorDefinition<ProcessorDefinition> {
+public class ResequenceDefinition extends ProcessorDefinition<ProcessorDefinition> {
@XmlElementRef
private List<ExpressionDefinition> expressions = new ArrayList<ExpressionDefinition>();
@XmlElementRef
@@ -52,11 +52,11 @@
@XmlTransient
private List<Expression> expressionList;
- public ResequencerDefinition() {
+ public ResequenceDefinition() {
this(null);
}
- public ResequencerDefinition(List<Expression> expressions) {
+ public ResequenceDefinition(List<Expression> expressions) {
this.expressionList = expressions;
this.batch();
}
@@ -74,7 +74,7 @@
*
* @return the builder
*/
- public ResequencerDefinition stream() {
+ public ResequenceDefinition stream() {
return stream(StreamResequencerConfig.getDefault());
}
@@ -84,7 +84,7 @@
*
* @return the builder
*/
- public ResequencerDefinition batch() {
+ public ResequenceDefinition batch() {
return batch(BatchResequencerConfig.getDefault());
}
@@ -95,7 +95,7 @@
* @param config the config
* @return the builder
*/
- public ResequencerDefinition stream(StreamResequencerConfig config) {
+ public ResequenceDefinition stream(StreamResequencerConfig config) {
this.streamConfig = config;
this.batchConfig = null;
return this;
@@ -108,7 +108,7 @@
* @param config the config
* @return the builder
*/
- public ResequencerDefinition batch(BatchResequencerConfig config) {
+ public ResequenceDefinition batch(BatchResequencerConfig config) {
this.batchConfig = config;
this.streamConfig = null;
return this;
@@ -120,7 +120,7 @@
* @param expression the expression
* @return the builder
*/
- public ResequencerDefinition expression(ExpressionDefinition expression) {
+ public ResequenceDefinition expression(ExpressionDefinition expression) {
expressions.add(expression);
return this;
}
@@ -130,7 +130,7 @@
* @param timeout timeout in millis
* @return the builder
*/
- public ResequencerDefinition timeout(long timeout) {
+ public ResequenceDefinition timeout(long timeout) {
if (batchConfig != null) {
batchConfig.setBatchTimeout(timeout);
} else {
@@ -144,7 +144,7 @@
* @param batchSize the batch size
* @return the builder
*/
- public ResequencerDefinition size(int batchSize) {
+ public ResequenceDefinition size(int batchSize) {
if (batchConfig == null) {
throw new IllegalStateException("size() only supported for batch resequencer");
}
@@ -158,7 +158,7 @@
* @param capacity the capacity
* @return the builder
*/
- public ResequencerDefinition capacity(int capacity) {
+ public ResequenceDefinition capacity(int capacity) {
if (streamConfig == null) {
throw new IllegalStateException("capacity() only supported for stream resequencer");
}
@@ -173,7 +173,7 @@
* @param comparator the comparator
* @return the builder
*/
- public ResequencerDefinition comparator(ExpressionResultComparator comparator) {
+ public ResequenceDefinition comparator(ExpressionResultComparator comparator) {
if (streamConfig == null) {
throw new IllegalStateException("comparator() only supported for stream resequencer");
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderRef.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderRef.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java Sun Mar 8 02:14:07 2009
@@ -31,16 +31,16 @@
*
* @version $Revision$
*/
-@XmlRootElement(name = "routeBuilderRef")
+@XmlRootElement(name = "routeBuilder")
@XmlAccessorType(XmlAccessType.FIELD)
-public class RouteBuilderRef extends IdentifiedType {
+public class RouteBuilderDefinition extends IdentifiedType {
@XmlAttribute(required = true)
private String ref;
- public RouteBuilderRef() {
+ public RouteBuilderDefinition() {
}
- public RouteBuilderRef(String ref) {
+ public RouteBuilderDefinition(String ref) {
this.ref = ref;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java Sun Mar 8 02:14:07 2009
@@ -52,7 +52,7 @@
@XmlAccessorType(XmlAccessType.PROPERTY)
public class RouteDefinition extends ProcessorDefinition<ProcessorDefinition> implements CamelContextAware {
private static final transient Log LOG = LogFactory.getLog(RouteDefinition.class);
- private List<InterceptorDefinition> interceptors = new ArrayList<InterceptorDefinition>();
+ private List<AbstractInterceptorDefinition> interceptors = new ArrayList<AbstractInterceptorDefinition>();
private List<FromDefinition> inputs = new ArrayList<FromDefinition>();
private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
private String group;
@@ -218,12 +218,12 @@
// Properties
// -----------------------------------------------------------------------
- public List<InterceptorDefinition> getInterceptors() {
+ public List<AbstractInterceptorDefinition> getInterceptors() {
return interceptors;
}
@XmlTransient
- public void setInterceptors(List<InterceptorDefinition> interceptors) {
+ public void setInterceptors(List<AbstractInterceptorDefinition> interceptors) {
this.interceptors = interceptors;
}
@@ -321,14 +321,14 @@
output.setErrorHandlerBuilder(getErrorHandlerBuilder());
}
- List<InterceptorDefinition> interceptors = getInterceptors();
- for (InterceptorDefinition interceptor : interceptors) {
+ List<AbstractInterceptorDefinition> interceptors = getInterceptors();
+ for (AbstractInterceptorDefinition interceptor : interceptors) {
output.addInterceptor(interceptor);
}
}
@Override
- public void addInterceptor(InterceptorDefinition interceptor) {
+ public void addInterceptor(AbstractInterceptorDefinition interceptor) {
getInterceptors().add(interceptor);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java Sun Mar 8 02:14:07 2009
@@ -46,11 +46,11 @@
@XmlElementRef
private List<RouteDefinition> routes = new ArrayList<RouteDefinition>();
@XmlTransient
- private List<InterceptorDefinition> interceptors = new ArrayList<InterceptorDefinition>();
+ private List<AbstractInterceptorDefinition> interceptors = new ArrayList<AbstractInterceptorDefinition>();
@XmlTransient
private List<InterceptDefinition> intercepts = new ArrayList<InterceptDefinition>();
@XmlTransient
- private List<ExceptionDefinition> exceptions = new ArrayList<ExceptionDefinition>();
+ private List<OnExceptionDefinition> exceptions = new ArrayList<OnExceptionDefinition>();
@XmlTransient
private CamelContext camelContext;
@XmlTransient
@@ -71,11 +71,11 @@
this.routes = routes;
}
- public List<InterceptorDefinition> getInterceptors() {
+ public List<AbstractInterceptorDefinition> getInterceptors() {
return interceptors;
}
- public void setInterceptors(List<InterceptorDefinition> interceptors) {
+ public void setInterceptors(List<AbstractInterceptorDefinition> interceptors) {
this.interceptors = interceptors;
}
@@ -87,11 +87,11 @@
this.intercepts = intercepts;
}
- public List<ExceptionDefinition> getExceptions() {
+ public List<OnExceptionDefinition> getExceptions() {
return exceptions;
}
- public void setExceptions(List<ExceptionDefinition> exceptions) {
+ public void setExceptions(List<OnExceptionDefinition> exceptions) {
this.exceptions = exceptions;
}
@@ -194,8 +194,8 @@
// lets configure the route
route.setCamelContext(getCamelContext());
route.setInheritErrorHandlerFlag(getInheritErrorHandlerFlag());
- List<InterceptorDefinition> list = getInterceptors();
- for (InterceptorDefinition interceptorType : list) {
+ List<AbstractInterceptorDefinition> list = getInterceptors();
+ for (AbstractInterceptorDefinition interceptorType : list) {
route.addInterceptor(interceptorType);
}
List<InterceptDefinition> intercepts = getIntercepts();
@@ -218,7 +218,7 @@
* @return the builder
*/
public RoutesDefinition intercept(DelegateProcessor interceptor) {
- getInterceptors().add(new InterceptorRef(interceptor));
+ getInterceptors().add(new InterceptorDefinition(interceptor));
return this;
}
@@ -251,8 +251,8 @@
* @param exception the exception
* @return the builder
*/
- public ExceptionDefinition onException(Class exception) {
- ExceptionDefinition answer = new ExceptionDefinition(exception);
+ public OnExceptionDefinition onException(Class exception) {
+ OnExceptionDefinition answer = new OnExceptionDefinition(exception);
getExceptions().add(answer);
return answer;
}
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=751357&r1=751356&r2=751357&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 Mar 8 02:14:07 2009
@@ -44,7 +44,7 @@
@XmlAttribute(required = false)
private String comparatorRef;
@XmlElement(name = "expression", required = false)
- private ExpressionSubElementType expression;
+ private ExpressionSubElementDefinition expression;
public SortDefinition() {
}
@@ -125,7 +125,7 @@
}
public void setExpression(Expression expression) {
- this.expression = new ExpressionSubElementType(expression);
+ this.expression = new ExpressionSubElementDefinition(expression);
}
/**
@@ -151,4 +151,4 @@
}
-}
\ No newline at end of file
+}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterDefinition.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterDefinition.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java Sun Mar 8 02:14:07 2009
@@ -43,7 +43,7 @@
*/
@XmlRootElement(name = "split")
@XmlAccessorType(XmlAccessType.FIELD)
-public class SplitterDefinition extends ExpressionNode {
+public class SplitDefinition extends ExpressionNode {
@XmlTransient
private AggregationStrategy aggregationStrategy;
@XmlAttribute(required = false)
@@ -57,14 +57,14 @@
@XmlAttribute(required = false)
private Boolean streaming = false;
- public SplitterDefinition() {
+ public SplitDefinition() {
}
- public SplitterDefinition(Expression expression) {
+ public SplitDefinition(Expression expression) {
super(expression);
}
- public SplitterDefinition(ExpressionDefinition expression) {
+ public SplitDefinition(ExpressionDefinition expression) {
super(expression);
}
@@ -120,7 +120,7 @@
*
* @return the builder
*/
- public ExpressionClause<SplitterDefinition> expression() {
+ public ExpressionClause<SplitDefinition> expression() {
return ExpressionClause.createAndSetExpression(this);
}
/**
@@ -128,7 +128,7 @@
*
* @return the builder
*/
- public SplitterDefinition aggregationStrategy(AggregationStrategy aggregationStrategy) {
+ public SplitDefinition aggregationStrategy(AggregationStrategy aggregationStrategy) {
setAggregationStrategy(aggregationStrategy);
return this;
}
@@ -138,7 +138,7 @@
*
* @return the builder
*/
- public SplitterDefinition parallelProcessing() {
+ public SplitDefinition parallelProcessing() {
setParallelProcessing(true);
return this;
}
@@ -151,18 +151,18 @@
*
* @return the builder
*/
- public SplitterDefinition parallelProcessing(boolean parallelProcessing) {
+ public SplitDefinition parallelProcessing(boolean parallelProcessing) {
setParallelProcessing(parallelProcessing);
return this;
}
/**
* Enables streaming.
- * See {@link SplitterDefinition#setStreaming(boolean)} for more information
+ * See {@link SplitDefinition#setStreaming(boolean)} for more information
*
* @return the builder
*/
- public SplitterDefinition streaming() {
+ public SplitDefinition streaming() {
setStreaming(true);
return this;
}
@@ -173,7 +173,7 @@
* @param executor the executor
* @return the builder
*/
- public SplitterDefinition executor(Executor executor) {
+ public SplitDefinition executor(Executor executor) {
setExecutor(executor);
return this;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java (from r751293, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerDefinition.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerDefinition.java&r1=751293&r2=751357&rev=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java Sun Mar 8 02:14:07 2009
@@ -36,7 +36,7 @@
*/
@XmlRootElement(name = "throttle")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ThrottlerDefinition extends ProcessorDefinition<ProcessorDefinition> {
+public class ThrottleDefinition extends ProcessorDefinition<ProcessorDefinition> {
@XmlAttribute
private Long maximumRequestsPerPeriod;
@XmlAttribute
@@ -44,10 +44,10 @@
@XmlElementRef
private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
- public ThrottlerDefinition() {
+ public ThrottleDefinition() {
}
- public ThrottlerDefinition(long maximumRequestsPerPeriod) {
+ public ThrottleDefinition(long maximumRequestsPerPeriod) {
this.maximumRequestsPerPeriod = maximumRequestsPerPeriod;
}
@@ -82,7 +82,7 @@
* @param timePeriodMillis period in millis
* @return the builder
*/
- public ThrottlerDefinition timePeriodMillis(long timePeriodMillis) {
+ public ThrottleDefinition timePeriodMillis(long timePeriodMillis) {
setTimePeriodMillis(timePeriodMillis);
return this;
}
@@ -93,7 +93,7 @@
* @param maximumRequestsPerPeriod the maximum request count number per time period
* @return the builder
*/
- public ThrottlerDefinition maximumRequestsPerPeriod(Long maximumRequestsPerPeriod) {
+ public ThrottleDefinition maximumRequestsPerPeriod(Long maximumRequestsPerPeriod) {
setMaximumRequestsPerPeriod(maximumRequestsPerPeriod);
return this;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java Sun Mar 8 02:14:07 2009
@@ -22,7 +22,6 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.camel.Exchange;
import org.apache.camel.processor.StreamResequencer;
import org.apache.camel.processor.resequencer.DefaultExchangeComparator;
import org.apache.camel.processor.resequencer.ExpressionResultComparator;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=751357&r1=751356&r2=751357&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java Sun Mar 8 02:14:07 2009
@@ -28,7 +28,7 @@
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
-import org.apache.camel.model.ExceptionDefinition;
+import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.MessageHelper;
@@ -276,7 +276,7 @@
exchange.setProperty(Exchange.EXCEPTION_CAUGHT, e);
// find the error handler to use (if any)
- ExceptionDefinition exceptionPolicy = getExceptionPolicy(exchange, e);
+ OnExceptionDefinition exceptionPolicy = getExceptionPolicy(exchange, e);
if (exceptionPolicy != null) {
data.currentRedeliveryPolicy = exceptionPolicy.createRedeliveryPolicy(exchange.getContext(), data.currentRedeliveryPolicy);
data.handledPredicate = exceptionPolicy.getHandledPolicy();