svn commit: r690924 - in /activemq/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/

[ge...@apache.org]

Author: gertv
Date: Mon Sep  1 02:36:55 2008
New Revision: 690924

URL: http://svn.apache.org/viewvc?rev=690924&view=rev
Log:
CAMEL-463: monitor-handle-ensure becomes attempt-handle-ensure

Modified:
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala
    activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
    activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala

Modified: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=690924&r1=690923&r2=690924&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala Mon Sep  1 02:36:55 2008
@@ -21,6 +21,7 @@
  */
 trait DSL {
   
+  def attempt : STryType
   def bean(bean: Any) : DSL
   def choice : SChoiceType
   def -->(uris: String*) : DSL
@@ -30,7 +31,6 @@
   def recipients(expression: Exchange => Any) : DSL
   def splitter(expression: Exchange => Any) : SSplitterType
   def otherwise : DSL
-  def monitor : STryType
   def multicast : SMulticastType
   def process(function: Exchange => Unit) : DSL
   def throttle(frequency: Frequency) : SThrottlerType

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=690924&r1=690923&r2=690924&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 Mon Sep  1 02:36:55 2008
@@ -48,6 +48,8 @@
     new SProcessorType(target.asInstanceOf[ProcessorType[P] forSome {type P}])
   }
   
+  def attempt : STryType = new STryType(target.tryBlock)
+  
   def splitter(expression: Exchange => Any) = 
     new SSplitterType(target.splitter(expression))
     
@@ -70,7 +72,6 @@
   def otherwise : SChoiceType = 
     throw new Exception("otherwise is only supported in a choice block or after a when statement")
   
-  def monitor : STryType = new STryType(target.tryBlock)
   
   def multicast = new SMulticastType(target.multicast)
   

Modified: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala?rev=690924&r1=690923&r2=690924&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala Mon Sep  1 02:36:55 2008
@@ -50,6 +50,7 @@
 
   def from(uri: String) = new SRouteType(builder.from(uri), this)
 
+  def attempt = stack.top.attempt
   def bean(bean: Any) = stack.top.bean(bean)
   def choice = stack.top.choice
   def -->(uris: String*) = stack.top.to(uris: _*)
@@ -59,7 +60,6 @@
   def recipients(expression: Exchange => Any) = stack.top.recipients(expression)
   def splitter(expression: Exchange => Any) = stack.top.splitter(expression)
   def otherwise = stack.top.otherwise
-  def monitor = stack.top.monitor
   def multicast = stack.top.multicast
   def process(function: Exchange => Unit) = stack.top.process(function)
   def throttle(frequency: Frequency) = stack.top.throttle(frequency)

Modified: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala?rev=690924&r1=690923&r2=690924&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala (original)
+++ activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala Mon Sep  1 02:36:55 2008
@@ -54,7 +54,7 @@
               
        //START SNIPPET: block}
        "direct:a" ==> {
-         monitor {
+         attempt {
            process(failingProcessor)
            to ("mock:a")
          } handle(classOf[Exception]) apply {