svn commit: r916140 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/ camel-core/src/test/java/org/apache/camel/processor/ tests/camel-itest/src/test/java/org/apache/camel/itest/jms/

[krasserm]

Author: krasserm
Date: Thu Feb 25 06:05:26 2010
New Revision: 916140

URL: http://svn.apache.org/viewvc?rev=916140&view=rev
Log:
CAMEL 2498 (Inconsitent definition of resequencer DSL) fixed

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
    
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java

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=916140&r1=916139&r2=916140&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
 Thu Feb 25 06:05:26 2010
@@ -1341,7 +1341,7 @@
      * @param expressions the list of expressions on which to compare messages 
in order
      * @return the builder
      */
-    public ResequenceDefinition resequencer(Expression... expressions) {
+    public ResequenceDefinition resequence(Expression... expressions) {
         List<Expression> list = new ArrayList<Expression>();
         list.addAll(Arrays.asList(expressions));
         return resequence(list);

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java?rev=916140&r1=916139&r2=916140&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
 Thu Feb 25 06:05:26 2010
@@ -56,7 +56,7 @@
         return new RouteBuilder() {
             public void configure() {
                 // START SNIPPET: example
-                from("direct:start").resequencer(body()).to("mock:result");
+                from("direct:start").resequence(body()).to("mock:result");
                 // END SNIPPET: example
             }
         };

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java?rev=916140&r1=916139&r2=916140&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
 Thu Feb 25 06:05:26 2010
@@ -92,7 +92,7 @@
         return new RouteBuilder() {
             public void configure() {
                 // START SNIPPET: example
-                
from("direct:start").resequencer(header("seqnum")).stream().to("mock:result");
+                
from("direct:start").resequence(header("seqnum")).stream().to("mock:result");
                 // END SNIPPET: example
             }
         };

Modified: 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java?rev=916140&r1=916139&r2=916140&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
 Thu Feb 25 06:05:26 2010
@@ -107,14 +107,14 @@
 
                 from("activemq:queue:batch")
                     .to(callExecuteOnBean("myBean1"))
-                    .resequencer(header("seqnum"))
+                    .resequence(header("seqnum"))
                     .batch(new BatchResequencerConfig(100, 2000L))
                     .to(callExecuteOnBean("myBean2"))
                     .to("activemq:queue:stop");
                 
                 from("activemq:queue:stream")
                     .to(callExecuteOnBean("myBean1"))
-                    .resequencer(header("seqnum"))
+                    .resequence(header("seqnum"))
                     .stream()
                     .to(callExecuteOnBean("myBean2"))
                     .to("activemq:queue:stop");