Author: ningjiang
Date: Mon Nov 21 05:03:57 2011
New Revision: 1204355
URL: http://svn.apache.org/viewvc?rev=1204355&view=rev
Log:
Merged revisions 1204338 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1204338 | ningjiang | 2011-11-21 11:21:15 +0800 (Mon, 21 Nov 2011) | 1 line
CAMEL-4698 Added support of defining route-scoped error handlers in Scala DSL
........
Added:
camel/branches/camel-2.8.x/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteErrorHandlerTest.scala
- copied unchanged from r1204338,
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteErrorHandlerTest.scala
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 21 05:03:57 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala?rev=1204355&r1=1204354&r2=1204355&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
(original)
+++
camel/branches/camel-2.8.x/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
Mon Nov 21 05:03:57 2011
@@ -18,6 +18,7 @@ package org.apache.camel.scala.dsl;
import org.apache.camel.model.RouteDefinition
import org.apache.camel.scala.dsl.builder.RouteBuilder
+import org.apache.camel.builder.ErrorHandlerBuilder
case class SRouteDefinition(override val target: RouteDefinition, val builder:
RouteBuilder) extends SAbstractDefinition[RouteDefinition] {
@@ -28,4 +29,8 @@ case class SRouteDefinition(override val
this
}
+ def errorHandler(handler: ErrorHandlerBuilder): SRouteDefinition = {
+ target.errorHandler(handler)
+ this
+ }
}
