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 2015/03/08 08:49:41 UTC

[5/7] camel git commit: CAMEL-8459: Java DSL - Align beanRef as bean to be similar to xml dsl

CAMEL-8459: Java DSL - Align beanRef as bean to be similar to xml dsl


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc31c6b6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc31c6b6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc31c6b6

Branch: refs/heads/master
Commit: bc31c6b64a58e1a45543f184b0c1a17411c1fe20
Parents: 10b2ced
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 7 15:52:02 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 8 07:18:16 2015 +0100

----------------------------------------------------------------------
 .../scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala   | 2 +-
 .../java/org/apache/camel/example/guice/jms/MyRouteBuilder.java  | 2 +-
 .../main/java/org/apache/camel/example/server/ServerRoutes.java  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bc31c6b6/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
index 6c51449..6d7c526 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
@@ -60,7 +60,7 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
 
   def bean(bean: Any) = bean match {
     case cls: Class[_] => wrap(target.bean(cls))
-    case ref: String => wrap(target.beanRef(ref))
+    case ref: String => wrap(target.bean(ref))
     case obj: Any => wrap(target.bean(obj))
   }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bc31c6b6/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java b/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java
index ee242dd..431c370 100644
--- a/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java
+++ b/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyRouteBuilder.java
@@ -32,7 +32,7 @@ public class MyRouteBuilder extends RouteBuilder {
         from("jms:test.MyQueue").to("file://target/routeOutput");
 
         // set up a listener on the file component
-        from("file://target/routeOutput?noop=true").beanRef("myBean");
+        from("file://target/routeOutput?noop=true").bean("myBean");
     }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/bc31c6b6/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
index 17ae942..71813f6 100644
--- a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
+++ b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/server/ServerRoutes.java
@@ -38,8 +38,8 @@ public class ServerRoutes extends RouteBuilder {
         // as above but with the bean: prefix
         //from("jms:queue:numbers").to("bean:multiplier");
 
-        // beanRef is using explicit bean bindings to lookup the multiplier bean and invoke the multiply method
-        //from("jms:queue:numbers").beanRef("multiplier", "multiply");
+        // bean is using explicit bean bindings to lookup the multiplier bean and invoke the multiply method
+        //from("jms:queue:numbers").bean("multiplier", "multiply");
 
         // the same as above but expressed as a URI configuration
         //from("jms:queue:numbers").to("bean:multiplier?methodName=multiply");