Author: ningjiang
Date: Sun Nov 30 18:37:53 2008
New Revision: 721948
URL: http://svn.apache.org/viewvc?rev=721948&view=rev
Log:
CAMEL-64 updated the Spring DSL
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/resequencerBatch.xml
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/resequencerStream.xml
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-collection.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayer.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/throttler.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
Sun Nov 30 18:37:53 2008
@@ -43,11 +43,11 @@
import org.apache.camel.spi.RouteContext;
/**
- * Represents an XML <aggregator/> element
+ * Represents an XML <aggregate/> element
*
* @version $Revision$
*/
[EMAIL PROTECTED](name = "aggregator")
[EMAIL PROTECTED](name = "aggregate")
@XmlAccessorType(XmlAccessType.FIELD)
public class AggregatorType extends ProcessorType<ProcessorType> {
@XmlElement(name = "correlationExpression", required = false)
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
Sun Nov 30 18:37:53 2008
@@ -29,15 +29,15 @@
import org.apache.camel.util.ObjectHelper;
/**
- * Represents an XML <delayer/> element
+ * Represents an XML <delay/> element
*
* @version $Revision$
*/
[EMAIL PROTECTED](name = "delayer")
[EMAIL PROTECTED](name = "delay")
@XmlAccessorType(XmlAccessType.FIELD)
public class DelayerType extends ExpressionNode {
@XmlElement
- private Long delay = 0L;
+ private Long delayTime = 0L;
public DelayerType() {
}
@@ -52,7 +52,7 @@
public DelayerType(Expression processAtExpression, long delay) {
super(processAtExpression);
- this.delay = delay;
+ this.delayTime = delay;
}
@Override
@@ -65,19 +65,19 @@
return "delayer";
}
- public Long getDelay() {
- return delay;
+ public Long getDelayTime() {
+ return delayTime;
}
- public void setDelay(Long delay) {
- this.delay = delay;
+ public void setDelayTime(Long delay) {
+ this.delayTime = delay;
}
@Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
Processor childProcessor = routeContext.createProcessor(this);
Expression processAtExpression =
createAbsoluteTimeDelayExpression(routeContext);
- return new Delayer(childProcessor, processAtExpression, delay);
+ return new Delayer(childProcessor, processAtExpression, delayTime);
}
private Expression createAbsoluteTimeDelayExpression(RouteContext
routeContext) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
Sun Nov 30 18:37:53 2008
@@ -258,7 +258,7 @@
* @return the builder
*/
public ExceptionType redeliveryDelay(long delay) {
- getOrCreateRedeliveryPolicy().delay(delay);
+ getOrCreateRedeliveryPolicy().redeliveryDelay(delay);
return this;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
Sun Nov 30 18:37:53 2008
@@ -38,7 +38,7 @@
@XmlAttribute
private Integer maximumRedeliveries;
@XmlAttribute
- private Long delay;
+ private Long redeliveryDelay;
@XmlAttribute
private Double backOffMultiplier;
@XmlAttribute
@@ -66,8 +66,8 @@
if (maximumRedeliveries != null) {
answer.setMaximumRedeliveries(maximumRedeliveries);
}
- if (delay != null) {
- answer.setDelay(delay);
+ if (redeliveryDelay != null) {
+ answer.setDelay(redeliveryDelay);
}
if (retriesExhaustedLogLevel != null) {
answer.setRetriesExhaustedLogLevel(retriesExhaustedLogLevel);
@@ -138,8 +138,8 @@
* @param delay delay in millis
* @return the builder
*/
- public RedeliveryPolicyType delay(long delay) {
- setDelay(delay);
+ public RedeliveryPolicyType redeliveryDelay(long delay) {
+ setRedeliveryDelay(delay);
return this;
}
@@ -242,12 +242,12 @@
this.collisionAvoidanceFactor = collisionAvoidanceFactor;
}
- public Long getDelay() {
- return delay;
+ public Long getRedeliveryDelay() {
+ return redeliveryDelay;
}
- public void setDelay(Long delay) {
- this.delay = delay;
+ public void setRedeliveryDelay(Long delay) {
+ this.redeliveryDelay = delay;
}
public Integer getMaximumRedeliveries() {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
Sun Nov 30 18:37:53 2008
@@ -37,11 +37,11 @@
import org.apache.camel.spi.RouteContext;
/**
- * Represents an XML <resequencer/> element
+ * Represents an XML <resequence/> element
*
* @version $Revision$
*/
[EMAIL PROTECTED](name = "resequencer")
[EMAIL PROTECTED](name = "resequence")
public class ResequencerType extends ProcessorType<ProcessorType> {
@XmlElementRef
private List<ExpressionType> expressions = new ArrayList<ExpressionType>();
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
Sun Nov 30 18:37:53 2008
@@ -35,11 +35,11 @@
import org.apache.camel.spi.RouteContext;
/**
- * Represents an XML <splitter/> element
+ * Represents an XML <split/> element
*
* @version $Revision$
*/
[EMAIL PROTECTED](name = "splitter")
[EMAIL PROTECTED](name = "split")
@XmlAccessorType(XmlAccessType.FIELD)
public class SplitterType extends ExpressionNode {
@XmlTransient
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
Sun Nov 30 18:37:53 2008
@@ -30,11 +30,11 @@
import org.apache.camel.spi.RouteContext;
/**
- * Represents an XML <throttler/> element
+ * Represents an XML <throttle/> element
*
* @version $Revision$
*/
[EMAIL PROTECTED](name = "throttler")
[EMAIL PROTECTED](name = "throttle")
@XmlAccessorType(XmlAccessType.FIELD)
public class ThrottlerType extends ProcessorType<ProcessorType> {
@XmlAttribute
Modified:
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/resequencerBatch.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/resequencerBatch.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/resequencerBatch.xml
(original)
+++
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/resequencerBatch.xml
Sun Nov 30 18:37:53 2008
@@ -18,13 +18,13 @@
<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="direct:start" />
- <resequencer>
+ <resequence>
<simple>body</simple>
<to uri="mock:result" />
<!--
- batch-config can be ommitted for default resequencer settings
+ batch-config can be ommitted for default resequence settings
-->
<batch-config batchTimeout="2000" batchSize="500"/>
- </resequencer>
+ </resequence>
</route>
</routes>
Modified:
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/resequencerStream.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/resequencerStream.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/resequencerStream.xml
(original)
+++
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/resequencerStream.xml
Sun Nov 30 18:37:53 2008
@@ -18,10 +18,10 @@
<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="direct:start" />
- <resequencer>
+ <resequence>
<simple>in.header.seqnum</simple>
<to uri="mock:result" />
<stream-config timeout="2000"/> <!-- Use default capacity -->
- </resequencer>
+ </resequence>
</route>
</routes>
Modified:
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml
(original)
+++
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/splitter.xml
Sun Nov 30 18:37:53 2008
@@ -18,9 +18,9 @@
<routes id="camel" xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="seda:a"/>
- <splitter>
+ <split>
<xpath>/foo/bar</xpath>
<to uri="seda:b"/>
- </splitter>
+ </split>
</route>
</routes>
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml
Sun Nov 30 18:37:53 2008
@@ -55,10 +55,10 @@
</route>
<route>
<from uri="direct:c.start"/>
- <resequencer>
+ <resequence>
<simple>body</simple>
<to uri="mock:c.end"/>
- </resequencer>
+ </resequence>
</route>
</camelContext>
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml
Sun Nov 30 18:37:53 2008
@@ -155,13 +155,13 @@
<route>
<from uri="seda:a"/>
- <splitter>
+ <split>
<recipients>
<bodyAs class="java.lang.String"/>
<tokenize token="
"/>
</recipients>
- </splitter>
+ </split>
<to uri="seda:b"/>
</route>
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-collection.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-collection.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-collection.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-collection.xml
Sun Nov 30 18:37:53 2008
@@ -26,9 +26,9 @@
<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="direct:start"/>
- <aggregator batchTimeout="500" collectionRef="aggregatorCollection">
+ <aggregate batchTimeout="500" collectionRef="aggregatorCollection">
<to uri="mock:result"/>
- </aggregator>
+ </aggregate>
</route>
</camelContext>
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml
Sun Nov 30 18:37:53 2008
@@ -26,12 +26,12 @@
<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="direct:start"/>
- <aggregator strategyRef="aggregatorStrategy">
+ <aggregate strategyRef="aggregatorStrategy">
<correlationExpression>
<simple>header.cheese</simple>
</correlationExpression>
<to uri="mock:result"/>
- </aggregator>
+ </aggregate>
</route>
</camelContext>
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
Sun Nov 30 18:37:53 2008
@@ -26,12 +26,12 @@
<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="direct:start"/>
- <aggregator>
+ <aggregate>
<correlationExpression>
<simple>header.cheese</simple>
</correlationExpression>
<to uri="mock:result"/>
- </aggregator>
+ </aggregate>
</route>
<route>
@@ -42,17 +42,17 @@
<route>
<from uri="direct:temp"/>
- <aggregator>
+ <aggregate>
<correlationExpression>
<simple>header.cheese</simple>
</correlationExpression>
<to uri="mock:result"/>
- </aggregator>
+ </aggregate>
</route>
<route>
<from uri="direct:predicate"/>
- <aggregator strategyRef="myAggregatorStrategy">
+ <aggregate strategyRef="myAggregatorStrategy">
<correlationExpression>
<simple>header.cheese</simple>
</correlationExpression>
@@ -60,7 +60,7 @@
<completedPredicate>
<method bean="myAggregatorStrategy" method="isCompleted"/>
</completedPredicate>
- </aggregator>
+ </aggregate>
</route>
</camelContext>
<!-- END SNIPPET: example -->
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayer.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayer.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayer.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayer.xml
Sun Nov 30 18:37:53 2008
@@ -30,18 +30,18 @@
xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="seda:a"/>
- <delayer>
+ <delay>
<simple>header.JMSTimestamp</simple>
- <delay>3000</delay>
- </delayer>
+ <delayTime>3000</delayTime>
+ </delay>
<to uri="mock:result"/>
</route>
<route>
<from uri="seda:b"/>
- <delayer>
+ <delay>
<expression/>
- <delay>3000</delay>
- </delayer>
+ <delayTime>3000</delayTime>
+ </delay>
<to uri="mock:result"/>
</route>
</camelContext>
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml
Sun Nov 30 18:37:53 2008
@@ -60,7 +60,7 @@
<route>
<from uri="direct:aggregater"/>
- <aggregator strategyRef="bodyInAggregatorStrategy">
+ <aggregate strategyRef="bodyInAggregatorStrategy">
<correlationExpression>
<simple>header.cheese</simple>
</correlationExpression>
@@ -68,7 +68,7 @@
<completedPredicate>
<method bean="bodyInAggregatorStrategy" method="isCompleted"/>
</completedPredicate>
- </aggregator>
+ </aggregate>
</route>
</camelContext>
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml
Sun Nov 30 18:37:53 2008
@@ -54,7 +54,7 @@
<onException>
<exception>java.io.IOException</exception>
<redeliveryPolicy
- delay="1000"
+ redeliveryDelay="1000"
maximumRedeliveries="3"
maximumRedeliveryDelay="10000"
backOffMultiplier="1.0"
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml
Sun Nov 30 18:37:53 2008
@@ -26,10 +26,10 @@
<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="direct:start"/>
- <resequencer>
+ <resequence>
<simple>body</simple>
<to uri="mock:result"/>
- </resequencer>
+ </resequence>
</route>
</camelContext>
<!-- END SNIPPET: example -->
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml
Sun Nov 30 18:37:53 2008
@@ -26,10 +26,10 @@
<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="direct:parallel-custom-pool"/>
- <splitter threadPoolExecutorRef="threadPoolExecutor">
+ <split threadPoolExecutorRef="threadPoolExecutor">
<xpath>/invoice/lineItems</xpath>
<to uri="mock:result"/>
- </splitter>
+ </split>
</route>
</camelContext>
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml
Sun Nov 30 18:37:53 2008
@@ -26,11 +26,11 @@
<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="direct:start"/>
- <resequencer>
+ <resequence>
<simple>in.header.seqnum</simple>
<to uri="mock:result" />
<stream-config />
- </resequencer>
+ </resequence>
</route>
</camelContext>
<!-- END SNIPPET: example -->
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/throttler.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/throttler.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/throttler.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/throttler.xml
Sun Nov 30 18:37:53 2008
@@ -27,9 +27,9 @@
xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="seda:a" />
- <throttler maximumRequestsPerPeriod="3" timePeriodMillis="30000">
+ <throttle maximumRequestsPerPeriod="3" timePeriodMillis="30000">
<to uri="mock:result" />
- </throttler>
+ </throttle>
</route>
</camelContext>
<!-- END SNIPPET: example -->
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml?rev=721948&r1=721947&r2=721948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
Sun Nov 30 18:37:53 2008
@@ -29,10 +29,10 @@
<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
<route>
<from uri="seda:a"/>
- <splitter>
+ <split>
<xpath>/invoice/lineItems</xpath>
<to uri="seda:b"/>
- </splitter>
+ </split>
</route>
</camelContext>
<!-- END SNIPPET: example -->
