You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/04/15 17:16:09 UTC

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

Author: ningjiang
Date: Tue Apr 15 08:16:05 2008
New Revision: 648279

URL: http://svn.apache.org/viewvc?rev=648279&view=rev
Log:
CAMEL-463 Applied the patch with thanks to Gert

Added:
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala   (with props)
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala   (contents, props changed)
      - copied, changed from r648068, activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichExchange.scala
Removed:
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichExchange.scala
Modified:
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichChoice.scala   (contents, props changed)
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichProcessor.scala   (props changed)
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichUriString.scala   (contents, props changed)
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RouteBuilder.scala   (contents, props changed)
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RouteBuilderSupport.scala   (props changed)
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/WhenPredicate.scala   (props changed)
    activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala   (props changed)
    activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichTestUri.scala   (contents, props changed)
    activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTestSupport.scala   (contents, props changed)
    activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala   (contents, props changed)
    activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala   (props changed)
    activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala   (contents, props changed)
    activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala   (contents, props changed)
    activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala   (contents, props changed)

Added: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala?rev=648279&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala (added)
+++ activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala Tue Apr 15 08:16:05 2008
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.scala;
+
+/**
+ * Trait containing common implicit conversion definitions
+ */
+trait Preamble {
+
+  implicit def exchangeWrapper(exchange: Exchange[T] forSome {type T}) = new RichExchange(exchange)
+
+}

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala (from r648068, activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichExchange.scala)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala?p2=activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala&p1=activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichExchange.scala&r1=648068&r2=648279&rev=648279&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichExchange.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala Tue Apr 15 08:16:05 2008
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.scala.dsl
+package org.apache.camel.scala
 
 import org.apache.camel.Exchange
+
+/**
+ * Rich wrapper for Camel's Exchange implementations
+ */
 
 class RichExchange(val exchange : Exchange) {
 

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichChoice.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichChoice.scala?rev=648279&r1=648278&r2=648279&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichChoice.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichChoice.scala Tue Apr 15 08:16:05 2008
@@ -20,11 +20,6 @@
 
 class RichChoiceType(val choice: ChoiceType, val builder:RouteBuilder) {
 
-  def then(block: => Unit) : ChoiceType = {
-    builder.build(choice, block)
-    choice
-  }
-
   def when(test: Exchange => Boolean)(block: => Unit) : ChoiceType = {
     choice
   }

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichChoice.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichChoice.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichProcessor.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichProcessor.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichUriString.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichUriString.scala?rev=648279&r1=648278&r2=648279&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichUriString.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichUriString.scala Tue Apr 15 08:16:05 2008
@@ -22,10 +22,10 @@
 class RichUriString(uri:String, builder:RouteBuilder) {
 
   def to(targets: String*) : ProcessorType[T] forSome {type T} = {
+    val from = builder.from(uri)
     targets.length match {
-      case 1 => builder.from(uri).to(targets(0))
+      case 1 => from.to(targets(0))
       case _ => {
-        val from = builder.from(uri)
         val multicast = from.multicast
         for (target <- targets) multicast.to(target)
         from

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichUriString.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RichUriString.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RouteBuilder.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RouteBuilder.scala?rev=648279&r1=648278&r2=648279&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RouteBuilder.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RouteBuilder.scala Tue Apr 15 08:16:05 2008
@@ -24,7 +24,7 @@
 /**
   Scala RouteBuilder implementation
   */
-class RouteBuilder {
+class RouteBuilder extends Preamble {
 
   val builder = new org.apache.camel.builder.RouteBuilder {
     override def configure() =  {}
@@ -35,7 +35,6 @@
   implicit def stringToUri(uri:String) : RichUriString = new RichUriString(uri, this)
   implicit def choiceWrapper(choice: ChoiceType) = new RichChoiceType(choice, this);
   implicit def processorWrapper(processor: ProcessorType[T] forSome {type T}) = new RichProcessor(processor)
-  implicit def exchangeWrapper(exchange: Exchange) = new RichExchange(exchange)
 
   def print() = {
     println(builder)
@@ -80,5 +79,11 @@
       case _ => throw new Exception("otherwise is only supported in a choice block or after a when statement")
     }
   }
+}
 
+object RouteBuilder {
+  
+  def routes(definitions: => Unit) = new RouteBuilder {
+    definitions
+  }
 }

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RouteBuilder.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RouteBuilder.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RouteBuilderSupport.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/RouteBuilderSupport.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/WhenPredicate.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/WhenPredicate.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichTestUri.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichTestUri.scala?rev=648279&r1=648278&r2=648279&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichTestUri.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichTestUri.scala Tue Apr 15 08:16:05 2008
@@ -21,9 +21,7 @@
 class RichTestUri(uri: String, support: ScalaTestSupport) {
 
   def !(messages: Any*) = {
-    for (message <- messages) {
-      support.getTemplate().sendBody(uri, message)
-    }
+    messages.foreach(support.getTemplate().sendBody(uri, _))
   }
 
   def expect(block: MockEndpoint => Unit) = {

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichTestUri.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichTestUri.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTestSupport.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTestSupport.scala?rev=648279&r1=648278&r2=648279&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTestSupport.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTestSupport.scala Tue Apr 15 08:16:05 2008
@@ -20,11 +20,10 @@
 import org.apache.camel.component.mock.MockEndpoint
 import org.apache.camel.scala.dsl._
 
-abstract class ScalaTestSupport extends ContextTestSupport with RouteBuilderSupport {
+abstract class ScalaTestSupport extends ContextTestSupport with RouteBuilderSupport with Preamble {
 
   implicit def stringToUri(uri:String) = new RichTestUri(uri, this)
   implicit def mockWrapper(endpoint: MockEndpoint) = new RichMockEndpoint(endpoint)
-  implicit def exchangeWrapper(exchange: Exchange[T] forSome {type T}) = new RichExchange(exchange)
 
   def assert(uri: String) = getMockEndpoint(uri).assertIsSatisfied
 

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTestSupport.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTestSupport.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala?rev=648279&r1=648278&r2=648279&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala Tue Apr 15 08:16:05 2008
@@ -31,10 +31,13 @@
     to assert
   }
 
-  override protected def createRouteBuilder() =
-    new RouteBuilder {
-       "direct:a" --> "mock:a"
-       "direct:b" to "mock:b"
-    }.print
-
+  override protected def createRouteBuilder() = new MyRouteBuilder
+  
+  //START SNIPPET: basic
+  class MyRouteBuilder extends RouteBuilder {
+    "direct:a" --> "mock:a"
+    "direct:b" to "mock:b"      
+  }
+  //END SNIPPET: basic
+  
 }

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala?rev=648279&r1=648278&r2=648279&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala Tue Apr 15 08:16:05 2008
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 package org.apache.camel.scala.dsl;
+ 
+import org.apache.camel.scala.dsl.RouteBuilder.routes;
 
 class FilterRouteBuilderTest extends ScalaTestSupport {
 
@@ -26,34 +28,33 @@
 
   def testFilterWithAlternatives() = {
     "mock:b" expect {_.expectedMessageCount(1)}
-    "mock:b" expect {_.expectedMessageCount(1)}
-    "mock:d" expect {_.expectedMessageCount(2)}
-    "mock:e" expect {_.expectedMessageCount(0)}
-    "mock:f" expect {_.expectedMessageCount(2)}
-    "direct:b" ! ("<hello/>", "<hellos/>")
+    "mock:c" expect {_.expectedMessageCount(1)}
+    "mock:d" expect {_.expectedMessageCount(3)}
+    "mock:e" expect {_.expectedMessageCount(2)}
+    "direct:b" ! ("<hello/>", "<hellos/>", "<hallo/>")
     "mock:b" assert()
     "mock:c" assert()
     "mock:d" assert()
     "mock:e" assert()
-    "mock:f" assert()
   }
 
   override protected def createRouteBuilder() =
     new RouteBuilder {
+       //START SNIPPET: simple
        "direct:a" when(_.in == "<hello/>") to "mock:a"
+       //END SNIPPET: simple
 
+       //START SNIPPET: alternatives
        "direct:b" ==> {
-         when(_.in == "<hello/>") then {
-           to ("mock:b")
-           --> ("mock:c")
-         }
          when(_.in == "<hallo/>") {
-           to ("mock:e")
+           --> ("mock:b")
+           to ("mock:c")
          } otherwise {
-           to ("mock:f")
+           to ("mock:e")
          }
          to ("mock:d")
        }
+       //END SNIPPET: alternatives
     }.print
 
 }

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala?rev=648279&r1=648278&r2=648279&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala Tue Apr 15 08:16:05 2008
@@ -38,8 +38,12 @@
 
   override protected def createRouteBuilder() =
     new RouteBuilder {
+      //START SNIPPET: simple
       "direct:a" --> ("mock:a", "mock:b") --> "mock:c"
       "direct:d" to ("mock:d", "mock:e") to "mock:f"
+      //END SNIPPET: simple
+      
+      //START SNIPPET: block
       "direct:g" ==> {
         --> ("mock:g", "mock:h")
         --> ("mock:i")
@@ -48,6 +52,7 @@
         to ("mock:j", "mock:k")
         to ("mock:l")
       }
+      //START SNIPPET: block
     }.print
 
 }

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala?rev=648279&r1=648278&r2=648279&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala Tue Apr 15 08:16:05 2008
@@ -35,9 +35,12 @@
 
   override protected def createRouteBuilder() =
     new RouteBuilder {
+       //START SNIPPET: simple
        "direct:a" --> "mock:a" --> "mock:b"
        "direct:c" to "mock:c" to "mock:d"
+       //END SNIPPET: simple
 
+       //START SNIPPET: block
        "direct:e" ==> {
          --> ("mock:e")
          --> ("mock:f")
@@ -47,6 +50,7 @@
          to ("mock:g")
          to ("mock:h")
        }
+       //END SNIPPET: block
     }.print
 
 }

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala
------------------------------------------------------------------------------
    svn:keywords = Rev Date