Author: ningjiang Date: Mon Nov 21 07:51:33 2011 New Revision: 1204384 URL: http://svn.apache.org/viewvc?rev=1204384&view=rev Log: Merged revisions 1204355 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
................ r1204355 | ningjiang | 2011-11-21 13:03:57 +0800 (Mon, 21 Nov 2011) | 9 lines 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.7.x/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteErrorHandlerTest.scala - copied unchanged from r1204355, camel/branches/camel-2.8.x/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteErrorHandlerTest.scala Modified: camel/branches/camel-2.7.x/ (props changed) camel/branches/camel-2.7.x/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 21 07:51:33 2011 @@ -1,2 +1,2 @@ -/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662 -/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659 +/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355 +/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338 Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.7.x/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala?rev=1204384&r1=1204383&r2=1204384&view=diff ============================================================================== --- camel/branches/camel-2.7.x/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala (original) +++ camel/branches/camel-2.7.x/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala Mon Nov 21 07:51:33 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 + } }
