svn commit: r949696 - in /camel/trunk/components/camel-scala/src: main/scala/org/apache/camel/scala/dsl/ main/scala/org/apache/camel/scala/dsl/builder/ test/scala/org/apache/camel/scala/dsl/

[ningjiang]

Author: ningjiang
Date: Mon May 31 09:19:49 2010
New Revision: 949696

URL: http://svn.apache.org/viewvc?rev=949696&view=rev
Log:
CAMEL-2704 Fixed the camel-scala test error of SRoutingSlipTest

Modified:
    
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
    
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
    
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
    
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SRoutingSlipTest.scala

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=949696&r1=949695&r2=949696&view=diff
==============================================================================
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
 Mon May 31 09:19:49 2010
@@ -58,6 +58,7 @@ trait DSL {
 
   def routingSlip(header: String) : DSL
   def routingSlip(header: String, separator: String) : DSL
+  def routingSlip(expression: Exchange => Any) : DSL
 
   def setbody(expression: Exchange => Any) : DSL
   def setfaultbody(expression: Exchange => Any) : DSL

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=949696&r1=949695&r2=949696&view=diff
==============================================================================
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
 Mon May 31 09:19:49 2010
@@ -126,6 +126,7 @@ abstract class SAbstractDefinition[P <: 
 
   def routingSlip(header: String) = wrap(target.routingSlip(header))
   def routingSlip(header: String, separator: String) = 
wrap(target.routingSlip(header, separator))
+  def routingSlip(expression: Exchange => Any) = 
wrap(target.routingSlip(expression))
   
   def setbody(expression: Exchange => Any) = wrap(target.setBody(expression))
 

Modified: 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala?rev=949696&r1=949695&r2=949696&view=diff
==============================================================================
--- 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
 Mon May 31 09:19:49 2010
@@ -119,6 +119,7 @@ class RouteBuilder extends Preamble with
   def rollback = stack.top.rollback
   def routingSlip(header: String) = stack.top.routingSlip(header)
   def routingSlip(header: String, separator: String) = 
stack.top.routingSlip(header, separator)
+  def routingSlip(expression: Exchange => Any) = 
stack.top.routingSlip(expression)
   def setbody(expression : Exchange => Any) = stack.top.setbody(expression)
   def setfaultbody(expression: Exchange => Any) = 
stack.top.setfaultbody(expression)
   def setheader(name: String, expression: Exchange => Any) = 
stack.top.setheader(name, expression)

Modified: 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SRoutingSlipTest.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SRoutingSlipTest.scala?rev=949696&r1=949695&r2=949696&view=diff
==============================================================================
--- 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SRoutingSlipTest.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SRoutingSlipTest.scala
 Mon May 31 09:19:49 2010
@@ -32,6 +32,8 @@ class SRoutingSlipTest extends RoutingSl
     }
 
     "direct:c" routingSlip("aRoutingSlipHeader", "#")
+    
+    "direct:d" routingSlip(_.in[String])
   }
 
 }