svn commit: r1430733 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java

[davsclaus]

Author: davsclaus
Date: Wed Jan  9 08:36:14 2013
New Revision: 1430733

URL: http://svn.apache.org/viewvc?rev=1430733&view=rev
Log:
CAMEL-5945: Add delimiter to recipient list eip in Java DSL

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1430731
  Merged /camel/branches/camel-2.10.x:r1430732

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java?rev=1430733&r1=1430732&r2=1430733&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
 Wed Jan  9 08:36:14 2013
@@ -182,6 +182,17 @@ public class RecipientListDefinition<Typ
     }
 
     /**
+     * Set the delimiter
+     *
+     * @param delimiter the delimiter
+     * @return the builder
+     */
+    public RecipientListDefinition<Type> delimiter(String delimiter) {
+        setDelimiter(delimiter);
+        return this;
+    }
+
+    /**
      * Set the aggregationStrategy
      *
      * @param aggregationStrategy the strategy

Modified: 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java?rev=1430733&r1=1430732&r2=1430733&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/RecipientListDirectNoConsumerIssueTest.java
 Wed Jan  9 08:36:14 2013
@@ -28,7 +28,7 @@ public class RecipientListDirectNoConsum
         getMockEndpoint("mock:error").expectedMinimumMessageCount(1);
         getMockEndpoint("mock:foo").expectedMinimumMessageCount(1);
 
-        template.sendBodyAndHeader("direct:start", "Hello World", "foo", 
"mock:foo,direct:foo");
+        template.sendBodyAndHeader("direct:start", "Hello World", "foo", 
"mock:foo;direct:foo");
 
         assertMockEndpointsSatisfied();
     }
@@ -51,7 +51,7 @@ public class RecipientListDirectNoConsum
                 onException(Exception.class).handled(true).to("mock:error");
 
                 from("direct:start")
-                    .recipientList().header("foo");
+                    .recipientList().header("foo").delimiter(";");
             }
         };
     }