camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r721328 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/model/ camel-core/src/test/java/org/apache/camel/builder/ camel-core/src/test/java/org/apache/camel/component/log/ camel-core/src/test/java/org/apache/camel/issue...
Date Fri, 28 Nov 2008 02:19:38 GMT
Author: ningjiang
Date: Thu Nov 27 18:19:36 2008
New Revision: 721328

URL: http://svn.apache.org/viewvc?rev=721328&view=rev
Log:
CAMEL-64 using the verb for the EIP action method

Modified:
    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/ProcessorType.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTimerAndTracerTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationStrategyTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/DefaultAggregatorCollectionTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/PredicateAggregatorCollectionTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
    activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java
    activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala
    activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java

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=721328&r1=721327&r2=721328&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
Thu Nov 27 18:19:36 2008
@@ -257,7 +257,7 @@
      * @param delay  delay in millis
      * @return the builder
      */
-    public ExceptionType delay(long delay) {
+    public ExceptionType setDelay(long delay) {
         getOrCreateRedeliveryPolicy().delay(delay);
         return this;
     }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
Thu Nov 27 18:19:36 2008
@@ -515,7 +515,7 @@
      * @param expression  the expression on which to split the message
      * @return the builder
      */
-    public SplitterType splitter(Expression expression) {
+    public SplitterType split(Expression expression) {
         SplitterType answer = new SplitterType(expression);
         addOutput(answer);
         return answer;
@@ -530,7 +530,7 @@
      *
      * @return the expression clause builder for the expression on which to split
      */
-    public ExpressionClause<SplitterType> splitter() {
+    public ExpressionClause<SplitterType> split() {
         SplitterType answer = new SplitterType();
         addOutput(answer);
         return ExpressionClause.createAndSetExpression(answer);
@@ -546,7 +546,7 @@
      * @param aggregationStrategy  the strategy used to aggregate responses for every part
      * @return the builder
      */
-    public SplitterType splitter(Expression expression, AggregationStrategy aggregationStrategy)
{
+    public SplitterType split(Expression expression, AggregationStrategy aggregationStrategy)
{
         SplitterType answer = new SplitterType(expression);
         addOutput(answer);
         answer.setAggregationStrategy(aggregationStrategy);
@@ -562,7 +562,7 @@
      * @param aggregationStrategy  the strategy used to aggregate responses for every part
      * @return the expression clause for the expression on which to split
      */
-    public ExpressionClause<SplitterType> splitter(AggregationStrategy aggregationStrategy)
{
+    public ExpressionClause<SplitterType> split(AggregationStrategy aggregationStrategy)
{
         SplitterType answer = new SplitterType();
         addOutput(answer);
         answer.setAggregationStrategy(aggregationStrategy);
@@ -579,7 +579,7 @@
      * @param parallelProcessing if is <tt>true</tt> camel will fork thread to
call the endpoint producer
      * @return the builder
      */
-    public SplitterType splitter(Expression expression, boolean parallelProcessing) {
+    public SplitterType split(Expression expression, boolean parallelProcessing) {
         SplitterType answer = new SplitterType(expression);
         addOutput(answer);
         answer.setParallelProcessing(parallelProcessing);
@@ -597,7 +597,7 @@
      * @param threadPoolExecutor override the default {@link ThreadPoolExecutor} 
      * @return the builder
      */
-    public SplitterType splitter(Expression expression, boolean parallelProcessing,
+    public SplitterType split(Expression expression, boolean parallelProcessing,
                                  ThreadPoolExecutor threadPoolExecutor) {
         SplitterType answer = new SplitterType(expression);
         addOutput(answer);
@@ -615,7 +615,7 @@
      * @param parallelProcessing if is <tt>true</tt> camel will fork thread to
call the endpoint producer
      * @return the expression clause for the expression on which to split
      */
-    public ExpressionClause<SplitterType> splitter(boolean parallelProcessing) {
+    public ExpressionClause<SplitterType> split(boolean parallelProcessing) {
         SplitterType answer = new SplitterType();
         addOutput(answer);
         answer.setParallelProcessing(parallelProcessing);
@@ -633,7 +633,7 @@
      * @param threadPoolExecutor override the default {@link ThreadPoolExecutor} 
      * @return the expression clause for the expression on which to split
      */
-    public ExpressionClause<SplitterType> splitter(boolean parallelProcessing, ThreadPoolExecutor
threadPoolExecutor) {
+    public ExpressionClause<SplitterType> split(boolean parallelProcessing, ThreadPoolExecutor
threadPoolExecutor) {
         SplitterType answer = new SplitterType();
         addOutput(answer);
         answer.setParallelProcessing(parallelProcessing);
@@ -652,7 +652,7 @@
      * @param parallelProcessing if is <tt>true</tt> camel will fork thread to
call the endpoint producer
      * @return the builder
      */
-    public SplitterType splitter(Expression expression, AggregationStrategy aggregationStrategy,
+    public SplitterType split(Expression expression, AggregationStrategy aggregationStrategy,
                                  boolean parallelProcessing) {
         SplitterType answer = new SplitterType(expression);
         addOutput(answer);
@@ -673,7 +673,7 @@
      * @param threadPoolExecutor override the default {@link ThreadPoolExecutor} 
      * @return the builder
      */
-    public SplitterType splitter(Expression expression, AggregationStrategy aggregationStrategy,
+    public SplitterType split(Expression expression, AggregationStrategy aggregationStrategy,
                                  boolean parallelProcessing, ThreadPoolExecutor threadPoolExecutor)
{
         SplitterType answer = new SplitterType(expression);
         addOutput(answer);
@@ -693,7 +693,7 @@
      * @param parallelProcessing if is <tt>true</tt> camel will fork thread to
call the endpoint producer
      * @return the expression clause for the expression on which to split
      */
-    public ExpressionClause<SplitterType> splitter(AggregationStrategy aggregationStrategy,
boolean parallelProcessing) {
+    public ExpressionClause<SplitterType> split(AggregationStrategy aggregationStrategy,
boolean parallelProcessing) {
         SplitterType answer = new SplitterType();
         addOutput(answer);
         answer.setAggregationStrategy(aggregationStrategy);
@@ -712,7 +712,7 @@
      * @param threadPoolExecutor override the default {@link ThreadPoolExecutor} 
      * @return the expression clause for the expression on which to split
      */
-    public ExpressionClause<SplitterType> splitter(AggregationStrategy aggregationStrategy,
boolean parallelProcessing,
+    public ExpressionClause<SplitterType> split(AggregationStrategy aggregationStrategy,
boolean parallelProcessing,
                                                    ThreadPoolExecutor threadPoolExecutor)
{
         SplitterType answer = new SplitterType();
         addOutput(answer);
@@ -724,11 +724,11 @@
     
     /**
      * <a href="http://activemq.apache.org/camel/resequencer.html">Resequencer EIP:</a>
-     * Creates a splitter allowing you to reorganise messages based on some comparator.
+     * Creates a resequencer allowing you to reorganize messages based on some comparator.
      *
      * @return the expression clause for the expressions on which to compare messages in
order
      */
-    public ExpressionClause<ResequencerType> resequencer() {
+    public ExpressionClause<ResequencerType> resequence() {
         ResequencerType answer = new ResequencerType();
         addOutput(answer);
         ExpressionClause<ResequencerType> clause = new ExpressionClause<ResequencerType>(answer);
@@ -738,23 +738,23 @@
 
     /**
      * <a href="http://activemq.apache.org/camel/resequencer.html">Resequencer EIP:</a>
-     * Creates a splitter allowing you to reorganise messages based on some comparator.
+     * Creates a resequencer allowing you to reorganize messages based on some comparator.
      *
      * @param expression the expression on which to compare messages in order
      * @return the builder
      */
-    public ResequencerType resequencer(Expression expression) {
-        return resequencer(Collections.<Expression>singletonList(expression));
+    public ResequencerType resequence(Expression expression) {
+        return resequence(Collections.<Expression>singletonList(expression));
     }
 
     /**
      * <a href="http://activemq.apache.org/camel/resequencer.html">Resequencer EIP:</a>
-     * Creates a splitter allowing you to reorganise messages based on some comparator.
+     * Creates a resequencer allowing you to reorganize messages based on some comparator.
      *
      * @param expressions the list of expressions on which to compare messages in order
      * @return the builder
      */
-    public ResequencerType resequencer(List<Expression> expressions) {
+    public ResequencerType resequence(List<Expression> expressions) {
         ResequencerType answer = new ResequencerType(expressions);
         addOutput(answer);
         return answer;
@@ -770,16 +770,16 @@
     public ResequencerType resequencer(Expression... expressions) {
         List<Expression> list = new ArrayList<Expression>();
         list.addAll(Arrays.asList(expressions));
-        return resequencer(list);
+        return resequence(list);
     }
 
     /**
      * <a href="http://activemq.apache.org/camel/aggregator.html">Aggregator EIP:</a>
      * Creates an aggregator allowing you to combine a number of messages together into a
single message.
      *
-     * @return the expression clause to be used as builder to configure the coorelation expression
+     * @return the expression clause to be used as builder to configure the correlation expression
      */
-    public ExpressionClause<AggregatorType> aggregator() {
+    public ExpressionClause<AggregatorType> aggregate() {
         if (!getOutputs().isEmpty()) {
             throw new IllegalArgumentException("Aggregator must be the only output added
to the route: " + this);
         }
@@ -793,9 +793,9 @@
      * Creates an aggregator allowing you to combine a number of messages together into a
single message.
      *
      * @param aggregationStrategy the strategy used for the aggregation
-     * @return the expression clause to be used as builder to configure the coorelation expression
+     * @return the expression clause to be used as builder to configure the correlation expression
      */
-    public ExpressionClause<AggregatorType> aggregator(AggregationStrategy aggregationStrategy)
{
+    public ExpressionClause<AggregatorType> aggregate(AggregationStrategy aggregationStrategy)
{
         if (!getOutputs().isEmpty()) {
             throw new IllegalArgumentException("Aggregator must be the only output added
to the route: " + this);
         }
@@ -812,7 +812,7 @@
      * @param aggregationCollection the collection used to perform the aggregation
      * @return the builder
      */
-    public AggregatorType aggregator(AggregationCollection aggregationCollection) {
+    public AggregatorType aggregate(AggregationCollection aggregationCollection) {
         if (!getOutputs().isEmpty()) {
             throw new IllegalArgumentException("Aggregator must be the only output added
to the route: " + this);
         }
@@ -832,7 +832,7 @@
      *                              <code>header("JMSCorrelationID")</code>
      * @return the builder
      */
-    public AggregatorType aggregator(Expression correlationExpression) {
+    public AggregatorType aggregate(Expression correlationExpression) {
         if (!getOutputs().isEmpty()) {
             throw new IllegalArgumentException("Aggregator must be the only output added
to the route: " + this);
         }
@@ -852,7 +852,7 @@
      * @param aggregationStrategy the strategy used for the aggregation
      * @return the builder
      */
-    public AggregatorType aggregator(Expression correlationExpression, AggregationStrategy
aggregationStrategy) {
+    public AggregatorType aggregate(Expression correlationExpression, AggregationStrategy
aggregationStrategy) {
         if (!getOutputs().isEmpty()) {
             throw new IllegalArgumentException("Aggregator must be the only output added
to the route: " + this);
         }
@@ -869,8 +869,8 @@
      *                             should be convertable to long as time in millis
      * @return the builder
      */
-    public DelayerType delayer(Expression processAtExpression) {
-        return delayer(processAtExpression, 0L);
+    public DelayerType delay(Expression processAtExpression) {
+        return delay(processAtExpression, 0L);
     }
 
     /**
@@ -882,7 +882,7 @@
      * @param delay                the delay in milliseconds which is added to the processAtExpression
      * @return the builder
      */
-    public DelayerType delayer(Expression processAtExpression, long delay) {
+    public DelayerType delay(Expression processAtExpression, long delay) {
         DelayerType answer = new DelayerType(processAtExpression, delay);
         addOutput(answer);
         return answer;
@@ -894,7 +894,7 @@
      *
      * @return the expression clause to create the expression
      */
-    public ExpressionClause<DelayerType> delayer() {
+    public ExpressionClause<DelayerType> delay() {
         DelayerType answer = new DelayerType();
         addOutput(answer);
         return ExpressionClause.createAndSetExpression(answer);
@@ -907,8 +907,8 @@
      * @param delay  the default delay in millis
      * @return the builder
      */
-    public DelayerType delayer(long delay) {
-        return delayer(null, delay);
+    public DelayerType delay(long delay) {
+        return delay(null, delay);
     }
 
     /**
@@ -922,7 +922,7 @@
      * @param maximumRequestCount  the maximum messages 
      * @return the builder
      */
-    public ThrottlerType throttler(long maximumRequestCount) {
+    public ThrottlerType throttle(long maximumRequestCount) {
         ThrottlerType answer = new ThrottlerType(maximumRequestCount);
         addOutput(answer);
         return answer;

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
Thu Nov 27 18:19:36 2008
@@ -166,7 +166,7 @@
                     .to(ERROR_QUEUE);
 
                 onException(IOException.class)
-                    .delay(5000L)
+                    .setDelay(5000L)
                     .maximumRedeliveries(3)
                     .maximumRedeliveryDelay(30000L)
                     .backOffMultiplier(1.0)
@@ -175,13 +175,13 @@
                     .to(ERROR_QUEUE);
 
                 onException(Exception.class)
-                    .delay(1000L)
+                    .setDelay(1000L)
                     .maximumRedeliveries(2)
                     .setHeader(MESSAGE_INFO, constant("Damm just exception"))
                     .to(ERROR_QUEUE);
 
                 onException(MyBaseBusinessException.class)
-                    .delay(1000L)
+                    .setDelay(1000L)
                     .maximumRedeliveries(3)
                     .setHeader(MESSAGE_INFO, constant("Damm my business is not going to well"))
                     .to(BUSINESS_ERROR_QUEUE);

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
Thu Nov 27 18:19:36 2008
@@ -121,7 +121,7 @@
                 
                 // START SNIPPET: exceptionBuilder1
                 onException(IOException.class)
-                    .delay(1000L)
+                    .setDelay(1000L)
                     .maximumRedeliveries(3)
                     .maximumRedeliveryDelay(10000L)
                     .backOffMultiplier(1.0)

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
Thu Nov 27 18:19:36 2008
@@ -381,7 +381,7 @@
         // START SNIPPET: splitter
         RouteBuilder builder = new RouteBuilder() {
             public void configure() {
-                from("seda:a").splitter(body(String.class).tokenize("\n")).to("seda:b");
+                from("seda:a").split(body(String.class).tokenize("\n")).to("seda:b");
             }
         };
         // END SNIPPET: splitter

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java
Thu Nov 27 18:19:36 2008
@@ -42,7 +42,7 @@
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("seda:in").to("log:hello?groupSize=2").delayer(100).to("mock:result");
+                from("seda:in").to("log:hello?groupSize=2").delay(100).to("mock:result");
             }
         };
     }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java
Thu Nov 27 18:19:36 2008
@@ -109,9 +109,9 @@
                     }
                 };
 
-                from("direct:custom").splitter(catFightCats).to("mock:result");
+                from("direct:custom").split(catFightCats).to("mock:result");
 
-                from("direct:xpath").splitter(xpath("/a/b")).to("mock:result");
+                from("direct:xpath").split(xpath("/a/b")).to("mock:result");
             }
         };
     }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java
Thu Nov 27 18:19:36 2008
@@ -89,18 +89,18 @@
 
                 // START SNIPPET: ex
                 // in this route we aggregate all from direct:state based on the header id
cheese
-                from("direct:start").aggregator(header("cheese")).to("mock:result");
+                from("direct:start").aggregate(header("cheese")).to("mock:result");
 
                 // because of a bug in Camel (CAMEL-393) we can not have other types between
from and aggregator
                 // so we must do it as here with two routes. In the fist line we set the
header visited to true
                 // and link it to the 2nd route by sending it to direct:temp...
                 from("seda:header").setHeader("visited", constant(true)).to("direct:temp");
                 // and here we consume from direct:temp to continue from above and aggregate
-                from("direct:temp").aggregator(header("cheese")).to("mock:result");
+                from("direct:temp").aggregate(header("cheese")).to("mock:result");
 
-                // in this sample we aggreagte using our own startegy with a completion predicate
+                // in this sample we aggregate using our own startegy with a completion predicate
                 // stating that the aggregated header is equal to 5.
-                from("direct:predicate").aggregator(header("cheese"), new MyAggregationStrategy()).
+                from("direct:predicate").aggregate(header("cheese"), new MyAggregationStrategy()).
                     completedPredicate(header("aggregated").isEqualTo(5)).to("mock:result");
                 // END SNIPPET: ex
             }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
Thu Nov 27 18:19:36 2008
@@ -55,10 +55,10 @@
         return new RouteBuilder() {
             public void configure() {
                 // START SNIPPET: ex
-                from("seda:a").delayer(header("JMSTimestamp"), 3000).to("mock:result");
+                from("seda:a").delay(header("JMSTimestamp"), 3000).to("mock:result");
                 // END SNIPPET: ex
                 // START SNIPPET: ex2
-                from("seda:b").delayer(3000).to("mock:result");
+                from("seda:b").delay(3000).to("mock:result");
                 // END SNIPPET: ex2
             }
         };

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java
Thu Nov 27 18:19:36 2008
@@ -81,7 +81,7 @@
                 from("direct:y").process(new AppendingProcessor("y")).to("direct:aggregator");
                 from("direct:z").process(new AppendingProcessor("z")).to("direct:aggregator");
 
-                from("direct:aggregator").aggregator(header("cheese"), new BodyInAggregatingStrategy()).
+                from("direct:aggregator").aggregate(header("cheese"), new BodyInAggregatingStrategy()).
                 completedPredicate(header(Exchange.AGGREGATED_COUNT).isEqualTo(3)).to("mock:result");
                 // END SNIPPET: example
             }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
Thu Nov 27 18:19:36 2008
@@ -183,10 +183,10 @@
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("direct:seqential").splitter(body().tokenize(","), new UseLatestAggregationStrategy()).to("mock:result");
-                from("direct:parallel").splitter(body().tokenize(","), new MyAggregationStrategy(),
true).to("mock:result");
-                from("direct:streaming").splitter(body().tokenize(",")).streaming().to("mock:result");
-                from("direct:parallel-streaming").splitter(body().tokenize(","), new MyAggregationStrategy(),
true).streaming().to("mock:result");
+                from("direct:seqential").split(body().tokenize(","), new UseLatestAggregationStrategy()).to("mock:result");
+                from("direct:parallel").split(body().tokenize(","), new MyAggregationStrategy(),
true).to("mock:result");
+                from("direct:streaming").split(body().tokenize(",")).streaming().to("mock:result");
+                from("direct:parallel-streaming").split(body().tokenize(","), new MyAggregationStrategy(),
true).streaming().to("mock:result");
             }
         };
     }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
Thu Nov 27 18:19:36 2008
@@ -69,7 +69,7 @@
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("direct:parallel-custom-pool").splitter(body().tokenize(","), true,
customThreadPoolExecutor).to("mock:result");
+                from("direct:parallel-custom-pool").split(body().tokenize(","), true, customThreadPoolExecutor).to("mock:result");
             }
         };
     }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java
Thu Nov 27 18:19:36 2008
@@ -44,7 +44,7 @@
         return new RouteBuilder() {
             public void configure() {
                 // START SNIPPET: ex
-                from("seda:a").throttler(3).timePeriodMillis(30000).to("mock:result");
+                from("seda:a").throttle(3).timePeriodMillis(30000).to("mock:result");
                 // END SNIPPET: ex
             }
         };

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorBatchOptionsTest.java
Thu Nov 27 18:19:36 2008
@@ -38,7 +38,7 @@
                     // aggregated by header id
                     // as we have not configured more on the aggregator it will default to
aggregate the
                     // latest exchange only
-                    .aggregator().header("id")
+                    .aggregate().header("id")
                     // wait for 0.5 seconds to aggregate
                     .batchTimeout(500L)
                     // batch size in is the limit of number of exchanges received, so when
we have received 100
@@ -89,7 +89,7 @@
                     // aggregated by header id
                     // as we have not configured more on the aggregator it will default to
aggregate the
                     // latest exchange only
-                    .aggregator().header("id")
+                    .aggregate().header("id")
                     // wait for 0.5 seconds to aggregate
                     .batchTimeout(500L)
                     // batch size in is the limit of number of exchanges received, so when
we have received 5
@@ -142,7 +142,7 @@
                     // aggregated by header id
                     // as we have not configured more on the aggregator it will default to
aggregate the
                     // latest exchange only
-                    .aggregator().header("id")
+                    .aggregate().header("id")
                     // wait for 0.5 seconds to aggregate
                     .batchTimeout(500L)
                     .to("mock:result");

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTimerAndTracerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTimerAndTracerTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTimerAndTracerTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTimerAndTracerTest.java
Thu Nov 27 18:19:36 2008
@@ -41,10 +41,10 @@
 
                 from("timer://kickoff?period=9999910000").
                     setHeader("id").constant("foo").setBody().constant("a b c").
-                    splitter(body().tokenize(" ")).to("seda:splitted");
+                    split(body().tokenize(" ")).to("seda:splitted");
 
                 from("seda:splitted").
-                    aggregator(header("id")).
+                    aggregate(header("id")).
                     to("mock:result");
             }
         };

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
Thu Nov 27 18:19:36 2008
@@ -159,7 +159,7 @@
 
                 from("direct:start")
                         // Separate people
-                        .splitter(bodyAs(String.class).tokenize(",")).process(
+                        .split(bodyAs(String.class).tokenize(",")).process(
 
                             // Split the name, erase the surname and put it in a
                             // header
@@ -178,13 +178,13 @@
                         .to("direct:joinSurnames");
 
                 from("direct:joinSurnames")
-                        .aggregator(header(SURNAME_HEADER),
+                        .aggregate(header(SURNAME_HEADER),
                                 surnameAggregator).setHeader(TYPE_HEADER,
                         constant(BROTHERS_TYPE)).to("direct:joinBrothers");
 
                 // Join all brothers lists and remove surname and type headers
                 AggregatorType agg =
-                        from("direct:joinBrothers").aggregator(header(TYPE_HEADER),
+                        from("direct:joinBrothers").aggregate(header(TYPE_HEADER),
                                 brothersAggregator);
 
                 agg.setBatchTimeout(2000L);

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
Thu Nov 27 18:19:36 2008
@@ -63,7 +63,7 @@
                 // our route is aggregating from the direct queue and sending the response
to the mock
                 from("direct:start")
                     // use our own collection for aggregation
-                    .aggregator(new MyReverseAggregationCollection())
+                    .aggregate(new MyReverseAggregationCollection())
                     // wait for 0.5 seconds to aggregate
                     .batchTimeout(500L)
                     .to("mock:result");

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationStrategyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationStrategyTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationStrategyTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationStrategyTest.java
Thu Nov 27 18:19:36 2008
@@ -54,7 +54,7 @@
                 // our route is aggregating from the direct queue and sending the response
to the mock
                 from("direct:start")
                     // aggregated by header id and use our own strategy how to aggregate
-                    .aggregator(new MyAggregationStrategy()).header("id")
+                    .aggregate(new MyAggregationStrategy()).header("id")
                     // wait for 0.5 seconds to aggregate
                     .batchTimeout(500L)
                     .to("mock:result");

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/DefaultAggregatorCollectionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/DefaultAggregatorCollectionTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/DefaultAggregatorCollectionTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/DefaultAggregatorCollectionTest.java
Thu Nov 27 18:19:36 2008
@@ -64,7 +64,7 @@
                     // aggregated by header id
                     // as we have not configured more on the aggregator it will default to
aggregate the
                     // latest exchange only
-                    .aggregator().header("id")
+                    .aggregate().header("id")
                     // wait for 0.5 seconds to aggregate
                     .batchTimeout(500L)
                     .to("mock:result");

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/PredicateAggregatorCollectionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/PredicateAggregatorCollectionTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/PredicateAggregatorCollectionTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/PredicateAggregatorCollectionTest.java
Thu Nov 27 18:19:36 2008
@@ -71,7 +71,7 @@
                 // our route is aggregating from the direct queue and sending the response
to the mock
                 from("direct:start")
                     // we use the collection based aggregator we already have configured
-                    .aggregator(ag)
+                    .aggregate(ag)
                     // wait for 0.5 seconds to aggregate
                     .batchTimeout(500L)
                     .to("mock:result");

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java Thu
Nov 27 18:19:36 2008
@@ -82,7 +82,7 @@
     static class ComplexRoute extends RouteBuilder {
         public void configure() throws Exception {
             from("file:target/xyz?noop=true").filter(header("foo").isEqualTo("bar"))
-                .recipientList(header("bar")).splitter(XPathBuilder.xpath("/invoice/lineItems")).throttler(3)
+                .recipientList(header("bar")).split(XPathBuilder.xpath("/invoice/lineItems")).throttle(3)
                 .to("mock:result");
         }
     }

Modified: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java
(original)
+++ activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java
Thu Nov 27 18:19:36 2008
@@ -85,7 +85,7 @@
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from(timeOutEndpointUri).to("jms:queue:test.b");
-                from("jms:queue:test.b").aggregator(header("cheese"), new AggregationStrategy()
{
+                from("jms:queue:test.b").aggregate(header("cheese"), new AggregationStrategy()
{
                     public Exchange aggregate(Exchange oldExchange, Exchange newExchange)
{
                         try {
                             Thread.sleep(2 * BatchProcessor.DEFAULT_BATCH_TIMEOUT);
@@ -101,7 +101,7 @@
                 from("jms:queue:point1").process(new MyProcessor()).to("jms:queue:reply");
                 from("jms:queue:point2").process(new MyProcessor()).to("jms:queue:reply");
                 from("jms:queue:point3").process(new MyProcessor()).to("jms:queue:reply");
-                from("jms:queue:reply").aggregator(header("cheese"), new AggregationStrategy()
{
+                from("jms:queue:reply").aggregate(header("cheese"), new AggregationStrategy()
{
                     public Exchange aggregate(Exchange oldExchange, Exchange newExchange)
{
                         Exchange copy = newExchange.copy();
                         LOG.info("try to aggregating the message ");

Modified: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
(original)
+++ activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
Thu Nov 27 18:19:36 2008
@@ -61,7 +61,7 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("activemq:queue:slow").delayer(3000).transform(constant("Bye World"));
+                from("activemq:queue:slow").delay(3000).transform(constant("Bye World"));
             }
         };
     }

Modified: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala
(original)
+++ activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala
Thu Nov 27 18:19:36 2008
@@ -54,7 +54,7 @@
   def attempt : STryType = new STryType(target.tryBlock)
   
   def splitter(expression: Exchange => Any) = 
-    new SSplitterType(target.splitter(expression))
+    new SSplitterType(target.split(expression))
     
   def recipients(expression: Exchange => Any) = 
     new SProcessorType(target.recipientList(expression).asInstanceOf[ProcessorType[P] forSome
{type P}])
@@ -90,13 +90,13 @@
   }
  
   
-  def throttle(frequency: Frequency) = new SThrottlerType(target.throttler(frequency.count).timePeriodMillis(frequency.period.milliseconds))
+  def throttle(frequency: Frequency) = new SThrottlerType(target.throttle(frequency.count).timePeriodMillis(frequency.period.milliseconds))
   
   def loadbalance = new SLoadBalanceType(target.loadBalance)
   
-  def delay(period: Period) = new SDelayerType(target.delayer(period.milliseconds))
+  def delay(period: Period) = new SDelayerType(target.delay(period.milliseconds))
   
-  def resequence(expression: Exchange => Any) = new SResequencerType(target.resequencer(expression))
+  def resequence(expression: Exchange => Any) = new SResequencerType(target.resequence(expression))
   
   def setbody(expression: Exchange => Any) = new SProcessorType(target.setBody(expression).asInstanceOf[ProcessorType[P]
forSome {type P}])
   
@@ -107,6 +107,6 @@
     this
   }
   
-  def aggregate(expression: Exchange => Any) = new SAggregatorType(target.aggregator(expression))
+  def aggregate(expression: Exchange => Any) = new SAggregatorType(target.aggregate(expression))
 
 }

Modified: activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java?rev=721328&r1=721327&r2=721328&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
(original)
+++ activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
Thu Nov 27 18:19:36 2008
@@ -86,7 +86,7 @@
         // Now we aggregating the response message by using the Constants.PROPERTY_SSN header
         // The aggregation will completed when all the three bank responses are received
         from("jms:queue:bankReplyQueue")
-            .aggregator(header(Constants.PROPERTY_SSN), new BankResponseAggregationStrategy())
+            .aggregate(header(Constants.PROPERTY_SSN), new BankResponseAggregationStrategy())
             .completedPredicate(header(Exchange.AGGREGATED_COUNT).isEqualTo(3))
 
         // Here we do some translation and put the message back to loanReplyQueue



Mime
View raw message