You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/08/18 09:50:48 UTC
[3/6] git commit: CAMEL-7712: scala-dsl should have routeId in the
DSL.
CAMEL-7712: scala-dsl should have routeId in the DSL.
Conflicts:
components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d84408e1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d84408e1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d84408e1
Branch: refs/heads/camel-2.12.x
Commit: d84408e101815ad50a3417bb340a03f4519b976b
Parents: dc3c36b
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 18 09:20:58 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 18 09:49:13 2014 +0200
----------------------------------------------------------------------
.../camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala | 1 +
.../scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d84408e1/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
index 9fba58d..5bc098f 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
@@ -77,6 +77,7 @@ trait DSL {
def recipients(expression: Exchange => Any) : DSL
def resequence(expression: Exchange => Any) : SResequenceDefinition
def rollback : DSL
+ def routeId(id: String) : DSL
def routingSlip(header: String) : DSL
def routingSlip(header: String, separator: String) : DSL
def routingSlip(expression: Exchange => Any) : DSL
http://git-wip-us.apache.org/repos/asf/camel/blob/d84408e1/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
index bdfdea5..e80b934 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
@@ -170,6 +170,7 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w
def recipients(expression: Exchange => Any) = stack.top.recipients(expression)
def resequence(expression: Exchange => Any) = stack.top.resequence(expression)
def rollback = stack.top.rollback
+ def routeId(id: String) = stack.top.routeId(id)
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)