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:37 UTC
[1/7] camel git commit: CAMEL-8459: Java DSL - Align beanRef as bean
to be similar to xml dsl
Repository: camel
Updated Branches:
refs/heads/master e29267f56 -> cfab63a58
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
index 6aaabec..708b1c3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientWithRollbackTest.java
@@ -83,12 +83,12 @@ public class TransactionalClientWithRollbackTest extends SpringTestSupport {
// must setup policy for each route
from("direct:okay").policy(required)
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
// must setup policy for each route
from("direct:fail").policy(required)
- .setBody(constant("Tiger in Action")).beanRef("bookService")
+ .setBody(constant("Tiger in Action")).bean("bookService")
// force a rollback
.rollback();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
index de0f21d..2c344e8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/route/DataSourceSpringRouteBuilder.java
@@ -31,13 +31,13 @@ public class DataSourceSpringRouteBuilder extends SpringRouteBuilder {
// set the required policy for this route
from("direct:okay").policy(required).
- setBody(constant("Tiger in Action")).beanRef("bookService").
- setBody(constant("Elephant in Action")).beanRef("bookService");
+ setBody(constant("Tiger in Action")).bean("bookService").
+ setBody(constant("Elephant in Action")).bean("bookService");
// set the required policy for this route
from("direct:fail").policy(required).
- setBody(constant("Tiger in Action")).beanRef("bookService").
- setBody(constant("Donkey in Action")).beanRef("bookService");
+ setBody(constant("Tiger in Action")).bean("bookService").
+ setBody(constant("Donkey in Action")).bean("bookService");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan3/MyHelloRoute.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan3/MyHelloRoute.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan3/MyHelloRoute.java
index c75c156..f90162c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan3/MyHelloRoute.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/contextscan3/MyHelloRoute.java
@@ -32,7 +32,7 @@ public class MyHelloRoute extends RouteBuilder {
@Override
public void configure() throws Exception {
from("direct:start")
- .beanRef("myHelloBean", "hello")
+ .bean("myHelloBean", "hello")
.to("mock:result");
}
[2/7] camel git commit: CAMEL-8459: Java DSL - Align beanRef as bean
to be similar to xml dsl
Posted by da...@apache.org.
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/10b2ced2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/10b2ced2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/10b2ced2
Branch: refs/heads/master
Commit: 10b2ced2d2e9a929cfe85479352e6144c06a45c7
Parents: ee8af5e
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 7 15:49:50 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 8 07:18:15 2015 +0100
----------------------------------------------------------------------
.../component/cassandra/CassandraComponent.java | 2 +-
.../component/cassandra/CassandraEndpoint.java | 10 ++++++++
.../EndpointDefinedUsingConfigPropertyTest.java | 2 +-
.../camel/cdi/InjectCamelAnnotationsTest.java | 2 +-
.../cdi/RegistryLookupAndInjectorTest.java | 2 +-
.../component/ejb/GreaterCamelBeanTest.java | 2 +-
.../component/hl7/HL7ByteArrayRouteTest.java | 4 ++--
.../HL7MLLPNettyCodecByteArrayRouteTest.java | 4 ++--
.../camel/component/hl7/HL7NettyRouteTest.java | 4 ++--
.../camel/component/hl7/HL7RouteTest.java | 4 ++--
.../jetty/HttpFilterCamelHeadersTest.java | 2 +-
...JmsRouteWithCustomListenerContainerTest.java | 2 +-
.../JmsRouteWithInOnlyAndMultipleAcksTest.java | 6 ++---
.../component/jms/JmsRouteWithInOnlyTest.java | 2 +-
.../jxpath/BeanWithJXPathInjectionTest.java | 2 +-
.../http/NettyHttpFilterCamelHeadersTest.java | 2 +-
.../http/NettyHttpFilterCamelHeadersTest.java | 2 +-
.../saxon/BeanWithXQueryInjectionTest.java | 2 +-
.../saxon/XPathAnnotationResultTypeTest.java | 4 ++--
.../spring/interceptor/AnnotatedRoute.java | 8 +++----
.../MixedPropagationTransactedTest.java | 8 +++----
.../MixedTransactionPropagationTest.java | 24 ++++++++++----------
.../TransactedInterceptSendToEndpointTest.java | 8 +++----
.../TransactionalClientDataSourceAsyncTest.java | 8 +++----
...ransactionalClientDataSourceHandledTest.java | 8 +++----
...sactionalClientDataSourceLookupTypeTest.java | 8 +++----
.../TransactionalClientDataSourceMDCTest.java | 8 +++----
...DataSourceMixedTransactedRedeliveryTest.java | 10 ++++----
...onalClientDataSourceMixedTransactedTest.java | 10 ++++----
...tionalClientDataSourceNotTransactedTest.java | 8 +++----
...ientDataSourceOnExceptionRedeliveryTest.java | 8 +++----
...sactionalClientDataSourceRedeliveryTest.java | 8 +++----
.../TransactionalClientDataSourceTest.java | 8 +++----
...sactionalClientDataSourceTransactedTest.java | 8 +++----
...ourceTransactedWithChoiceRedeliveryTest.java | 8 +++----
...lientDataSourceTransactedWithChoiceTest.java | 8 +++----
...eTransactedWithFileLocalOnExceptionTest.java | 8 +++----
...SourceTransactedWithFileOnExceptionTest.java | 8 +++----
...lClientDataSourceTransactedWithFileTest.java | 8 +++----
...ourceTransactedWithLocalOnExceptionTest.java | 8 +++----
...ntDataSourceTransactionErrorHandlerTest.java | 8 +++----
...taSourceWithNoErrorHandlerConfigureTest.java | 8 +++----
...ceWithOnExceptionHandledAndRollbackTest.java | 8 +++----
...onHandledAndRollbackUsingTransactedTest.java | 8 +++----
...WithOnExceptionMinimalConfigurationTest.java | 8 +++----
...ntDataSourceWithOnExceptionRollbackTest.java | 8 +++----
...onalClientDataSourceWithOnExceptionTest.java | 8 +++----
...edErrorHandlerOnExceptionRedeliveryTest.java | 8 +++----
.../TransactionalClientWithRollbackTest.java | 6 ++---
.../route/DataSourceSpringRouteBuilder.java | 8 +++----
.../issues/contextscan3/MyHelloRoute.java | 2 +-
51 files changed, 169 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraComponent.java b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraComponent.java
index a6e9e33..ad25d8f 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraComponent.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraComponent.java
@@ -75,7 +75,7 @@ public class CassandraComponent extends UriEndpointComponent {
rs = ResultSetConversionStrategies.fromName(strategy);
}
CassandraEndpoint endpoint = new CassandraEndpoint(uri, this);
- endpoint.setBeanRef(beanRef);
+ endpoint.setBean(beanRef);
endpoint.setHosts(hosts);
if (port != null) {
int num = CamelContextHelper.parseInteger(getCamelContext(), port);
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
index c235f24..01f2831 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
@@ -181,10 +181,20 @@ public class CassandraEndpoint extends DefaultEndpoint {
message.setBody(resultSetConversionStrategy.getBody(resultSet));
}
+ public String getBean() {
+ return beanRef;
+ }
+
+ public void setBean(String beanRef) {
+ this.beanRef = beanRef;
+ }
+
+ @Deprecated
public String getBeanRef() {
return beanRef;
}
+ @Deprecated
public void setBeanRef(String beanRef) {
this.beanRef = beanRef;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java
index 67f7f3a..d254ccf 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java
@@ -71,7 +71,7 @@ public class EndpointDefinedUsingConfigPropertyTest extends CdiContextTestSuppor
@Override
public void configure() throws Exception {
from(directInjectEndpoint)
- .beanRef("shoppingBean", "listAllProducts")
+ .bean("shoppingBean", "listAllProducts")
.to(mockResultEndpoint);
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-cdi/src/test/java/org/apache/camel/cdi/InjectCamelAnnotationsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/InjectCamelAnnotationsTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/InjectCamelAnnotationsTest.java
index b2c3910..5d6bce7 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/InjectCamelAnnotationsTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/InjectCamelAnnotationsTest.java
@@ -70,7 +70,7 @@ public class InjectCamelAnnotationsTest extends CdiContextTestSupport {
@Override
public void configure() throws Exception {
from(directInjectEndpoint)
- .beanRef("shoppingBean", "listAllProducts")
+ .bean("shoppingBean", "listAllProducts")
.to(mockResultEndpoint);
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-cdi/src/test/java/org/apache/camel/cdi/RegistryLookupAndInjectorTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/RegistryLookupAndInjectorTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/RegistryLookupAndInjectorTest.java
index b196aea..34844e7 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/RegistryLookupAndInjectorTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/RegistryLookupAndInjectorTest.java
@@ -83,7 +83,7 @@ public class RegistryLookupAndInjectorTest extends CdiContextTestSupport {
@Override
public void configure() throws Exception {
from("direct:injectByName")
- .beanRef("shoppingBean", "listAllProducts")
+ .bean("shoppingBean", "listAllProducts")
.to("mock:result");
from("direct:injectByType")
.bean(ShoppingBean.class, "listAllProducts")
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterCamelBeanTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterCamelBeanTest.java b/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterCamelBeanTest.java
index 8839639..0e88b01 100644
--- a/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterCamelBeanTest.java
+++ b/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterCamelBeanTest.java
@@ -54,7 +54,7 @@ public class GreaterCamelBeanTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
from("direct:start")
- .beanRef("GreaterImplLocal", "hello")
+ .bean("GreaterImplLocal", "hello")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
index 38da5df..0dc0a74 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
@@ -130,11 +130,11 @@ public class HL7ByteArrayRouteTest extends HL7TestSupport {
.choice()
// where we choose that A19 queries invoke the handleA19 method on our hl7service bean
.when(header("CamelHL7TriggerEvent").isEqualTo("A19"))
- .beanRef("hl7service", "handleA19")
+ .bean("hl7service", "handleA19")
.to("mock:a19")
// and A01 should invoke the handleA01 method on our hl7service bean
.when(header("CamelHL7TriggerEvent").isEqualTo("A01")).to("mock:a01")
- .beanRef("hl7service", "handleA01")
+ .bean("hl7service", "handleA01")
.to("mock:a19")
// other types should go to mock:unknown
.otherwise()
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
index d49187e..bb9fc83 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
@@ -132,11 +132,11 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends HL7TestSupport {
.choice()
// where we choose that A19 queries invoke the handleA19 method on our hl7service bean
.when(header("CamelHL7TriggerEvent").isEqualTo("A19"))
- .beanRef("hl7service", "handleA19")
+ .bean("hl7service", "handleA19")
.to("mock:a19")
// and A01 should invoke the handleA01 method on our hl7service bean
.when(header("CamelHL7TriggerEvent").isEqualTo("A01")).to("mock:a01")
- .beanRef("hl7service", "handleA01")
+ .bean("hl7service", "handleA01")
.to("mock:a19")
// other types should go to mock:unknown
.otherwise()
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
index a26ae41..79a337d 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
@@ -132,11 +132,11 @@ public class HL7NettyRouteTest extends HL7TestSupport {
.choice()
// where we choose that A19 queries invoke the handleA19 method on our hl7service bean
.when(header("CamelHL7TriggerEvent").isEqualTo("A19"))
- .beanRef("hl7service", "handleA19")
+ .bean("hl7service", "handleA19")
.to("mock:a19")
// and A01 should invoke the handleA01 method on our hl7service bean
.when(header("CamelHL7TriggerEvent").isEqualTo("A01")).to("mock:a01")
- .beanRef("hl7service", "handleA01")
+ .bean("hl7service", "handleA01")
.to("mock:a19")
// other types should go to mock:unknown
.otherwise()
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
index ea342a2..05e44eb 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
@@ -129,11 +129,11 @@ public class HL7RouteTest extends HL7TestSupport {
.choice()
// where we choose that A19 queries invoke the handleA19 method on our hl7service bean
.when(header("CamelHL7TriggerEvent").isEqualTo("A19"))
- .beanRef("hl7service", "handleA19")
+ .bean("hl7service", "handleA19")
.to("mock:a19")
// and A01 should invoke the handleA01 method on our hl7service bean
.when(header("CamelHL7TriggerEvent").isEqualTo("A01")).to("mock:a01")
- .beanRef("hl7service", "handleA01")
+ .bean("hl7service", "handleA01")
.to("mock:a19")
// other types should go to mock:unknown
.otherwise()
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java
index 4527062..9deded9 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpFilterCamelHeadersTest.java
@@ -65,7 +65,7 @@ public class HttpFilterCamelHeadersTest extends BaseJettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("jetty:http://localhost:{{port}}/test/filter").beanRef("foo");
+ from("jetty:http://localhost:{{port}}/test/filter").bean("foo");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
index 6e2a486..07f4e4c 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
@@ -87,7 +87,7 @@ public class JmsRouteWithCustomListenerContainerTest extends CamelTestSupport {
from("activemq:queue:inbox?messageListenerContainerFactoryRef=myListenerContainerFactory")
.to("mock:inbox")
.inOnly("activemq:topic:order")
- .beanRef("orderService", "handleOrder");
+ .bean("orderService", "handleOrder");
from("activemq:topic:order")
.to("mock:topic");
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
index a52ea6b..96ca3a6 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
@@ -78,18 +78,18 @@ public class JmsRouteWithInOnlyAndMultipleAcksTest extends CamelTestSupport {
from("amq:queue:inbox")
.to("mock:inbox")
.inOnly("amq:topic:orderServiceNotification")
- .beanRef("orderService", "handleOrder");
+ .bean("orderService", "handleOrder");
// this route collects an order request notification
// and sends back an acknowledgment back to a queue
from("amq:topic:orderServiceNotification")
- .beanRef("orderServiceNotificationWithAck-1", "handleOrderNotificationWithAck")
+ .bean("orderServiceNotificationWithAck-1", "handleOrderNotificationWithAck")
.to("amq:queue:orderServiceNotificationAck");
// this route collects an order request notification
// and sends back an acknowledgment back to a queue
from("amq:topic:orderServiceNotification")
- .beanRef("orderServiceNotificationWithAck-2", "handleOrderNotificationWithAck")
+ .bean("orderServiceNotificationWithAck-2", "handleOrderNotificationWithAck")
.to("amq:queue:orderServiceNotificationAck");
// this route collects all order notifications acknowledgments
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
index 26e9248..40a2217 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
@@ -78,7 +78,7 @@ public class JmsRouteWithInOnlyTest extends CamelTestSupport {
from("activemq:queue:inbox")
.to("mock:inbox")
.inOnly("activemq:topic:order")
- .beanRef("orderService", "handleOrder");
+ .bean("orderService", "handleOrder");
from("activemq:topic:order")
.to("mock:topic");
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java b/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java
index 7b1d3b0..1c3d315 100644
--- a/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java
+++ b/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java
@@ -61,7 +61,7 @@ public class BeanWithJXPathInjectionTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java
index 47f0dd5..bdc9c55 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java
@@ -61,7 +61,7 @@ public class NettyHttpFilterCamelHeadersTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty-http:http://localhost:{{port}}/test/filter").beanRef("foo");
+ from("netty-http:http://localhost:{{port}}/test/filter").bean("foo");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java
index c032a65..62e4fcf 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java
@@ -61,7 +61,7 @@ public class NettyHttpFilterCamelHeadersTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/test/filter").beanRef("foo");
+ from("netty4-http:http://localhost:{{port}}/test/filter").bean("foo");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
index 18befd3..7044749 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
@@ -53,7 +53,7 @@ public class BeanWithXQueryInjectionTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
index 6f89d78..a4bb61c 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
@@ -53,8 +53,8 @@ public class XPathAnnotationResultTypeTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
System.setProperty(XPathFactory.DEFAULT_PROPERTY_NAME + ":" + "http://saxon.sf.net/jaxp/xpath/om", "net.sf.saxon.xpath.XPathFactoryImpl");
- from("direct:in1").beanRef("myBean", "readImplicit");
- from("direct:in2").beanRef("myBean", "readExplicit");
+ from("direct:in1").bean("myBean", "readImplicit");
+ from("direct:in2").bean("myBean", "readExplicit");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedRoute.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedRoute.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedRoute.java
index 6ac3315..20faaa6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedRoute.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedRoute.java
@@ -26,13 +26,13 @@ public class AnnotatedRoute extends SpringRouteBuilder {
public void configure() throws Exception {
from("direct:okay").
transacted().
- setBody(constant("Tiger in Action")).beanRef("bookService").
- setBody(constant("Elephant in Action")).beanRef("bookService");
+ setBody(constant("Tiger in Action")).bean("bookService").
+ setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail").
transacted().
- setBody(constant("Tiger in Action")).beanRef("bookService").
- setBody(constant("Donkey in Action")).beanRef("bookService");
+ setBody(constant("Tiger in Action")).bean("bookService").
+ setBody(constant("Donkey in Action")).bean("bookService");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
index bdcd5b1..0786eb8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedPropagationTransactedTest.java
@@ -135,16 +135,16 @@ public class MixedPropagationTransactedTest extends SpringTestSupport {
public void configure() throws Exception {
from("direct:required")
.transacted("PROPATATION_REQUIRED")
- .beanRef("bookService");
+ .bean("bookService");
from("direct:required2")
.transacted("PROPATATION_REQUIRED")
- .beanRef("bookService")
- .beanRef("bookService");
+ .bean("bookService")
+ .bean("bookService");
from("direct:new")
.transacted("PROPAGATION_REQUIRES_NEW")
- .beanRef("bookService");
+ .bean("bookService");
from("direct:requiredAndNew").to("direct:required", "direct:new");
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
index 4f9fcf2..bdb892e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
@@ -102,21 +102,21 @@ public class MixedTransactionPropagationTest extends SpringTestSupport {
public void configure() throws Exception {
from("direct:okay")
.transacted("PROPAGATION_REQUIRED")
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
.transacted("PROPAGATION_REQUIRED")
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
// START SNIPPET: e1
from("direct:mixed")
// using required
.transacted("PROPAGATION_REQUIRED")
// all these steps will be okay
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService")
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService")
// continue on route 2
.to("direct:mixed2");
@@ -127,17 +127,17 @@ public class MixedTransactionPropagationTest extends SpringTestSupport {
// using a different propagation which is requires new
.transacted("PROPAGATION_REQUIRES_NEW")
// this step will be okay
- .setBody(constant("Lion in Action")).beanRef("bookService")
+ .setBody(constant("Lion in Action")).bean("bookService")
// this step will fail with donkey
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e1
from("direct:mixed3")
// using required
.transacted("PROPAGATION_REQUIRED")
// all these steps will be okay
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService")
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService")
// continue on route 4
.to("direct:mixed4");
@@ -148,9 +148,9 @@ public class MixedTransactionPropagationTest extends SpringTestSupport {
// using a different propagation which is requires new
.transacted("PROPAGATION_REQUIRES_NEW")
// this step will be okay
- .setBody(constant("Lion in Action")).beanRef("bookService")
+ .setBody(constant("Lion in Action")).bean("bookService")
// this step will be okay
- .setBody(constant("Crocodile in Action")).beanRef("bookService");
+ .setBody(constant("Crocodile in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java
index 751a6fd..eb25e91 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptSendToEndpointTest.java
@@ -51,14 +51,14 @@ public class TransactedInterceptSendToEndpointTest extends TransactionalClientDa
from("direct:okay")
.transacted()
.to("direct:foo")
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
+ .setBody(constant("Tiger in Action")).bean("bookService")
.to("direct:bar")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Donkey in Action")).bean("bookService");
from("direct:foo").to("log:okay");
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
index b1d01f3..a442089 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
@@ -66,19 +66,19 @@ public class TransactionalClientDataSourceAsyncTest extends TransactionalClientD
from("direct:okay")
.policy(required)
- .setBody(constant("Tiger in Action")).beanRef("bookService")
+ .setBody(constant("Tiger in Action")).bean("bookService")
.log("Before thread ${threadName}")
.to("async:bye:camel")
.log("After thread ${threadName}")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
.policy(required)
- .setBody(constant("Tiger in Action")).beanRef("bookService")
+ .setBody(constant("Tiger in Action")).bean("bookService")
.log("Before thread ${threadName}")
.to("async:bye:camel")
.log("After thread ${threadName}")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java
index c32c38d..b3b418f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceHandledTest.java
@@ -51,14 +51,14 @@ public class TransactionalClientDataSourceHandledTest extends TransactionalClien
from("direct:okay")
// mark this route as transacted
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
// mark this route as transacted
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e1
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java
index b5485c2..77d76e5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java
@@ -49,13 +49,13 @@ public class TransactionalClientDataSourceLookupTypeTest extends TransactionalCl
// START SNIPPET: e2
// set the required policy for this route
from("direct:okay").policy(required).
- setBody(constant("Tiger in Action")).beanRef("bookService").
- setBody(constant("Elephant in Action")).beanRef("bookService");
+ setBody(constant("Tiger in Action")).bean("bookService").
+ setBody(constant("Elephant in Action")).bean("bookService");
// set the required policy for this route
from("direct:fail").policy(required).
- setBody(constant("Tiger in Action")).beanRef("bookService").
- setBody(constant("Donkey in Action")).beanRef("bookService");
+ setBody(constant("Tiger in Action")).bean("bookService").
+ setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e2
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java
index bb571cf..9107225 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java
@@ -42,9 +42,9 @@ public class TransactionalClientDataSourceMDCTest extends TransactionalClientDat
}
})
.to("log:foo")
- .setBody(constant("Tiger in Action")).beanRef("bookService")
+ .setBody(constant("Tiger in Action")).bean("bookService")
.to("log:bar")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Elephant in Action")).bean("bookService");
// marks this route as transacted that will use the single policy defined in the registry
from("direct:fail").routeId("route-b")
@@ -57,9 +57,9 @@ public class TransactionalClientDataSourceMDCTest extends TransactionalClientDat
}
})
.to("log:foo2")
- .setBody(constant("Tiger in Action")).beanRef("bookService")
+ .setBody(constant("Tiger in Action")).bean("bookService")
.to("log:bar2")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedRedeliveryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedRedeliveryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedRedeliveryTest.java
index bc2789d..9829222 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedRedeliveryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedRedeliveryTest.java
@@ -34,15 +34,15 @@ public class TransactionalClientDataSourceMixedTransactedRedeliveryTest extends
from("direct:okay")
// mark this route as transacted
.errorHandler(transactionErrorHandler().maximumRedeliveries(3))
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
from("direct:fail")
// and this route is not transacted
.errorHandler(defaultErrorHandler())
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java
index b287f20..5935c01 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMixedTransactedTest.java
@@ -43,14 +43,14 @@ public class TransactionalClientDataSourceMixedTransactedTest extends Transactio
from("direct:okay")
// mark this route as transacted
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
from("direct:fail")
// and this route is not transacted
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java
index caa0689..555f793 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceNotTransactedTest.java
@@ -44,12 +44,12 @@ public class TransactionalClientDataSourceNotTransactedTest extends Transactiona
return new SpringRouteBuilder() {
public void configure() throws Exception {
from("direct:okay")
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java
index 96f7f11..e415696 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceOnExceptionRedeliveryTest.java
@@ -60,16 +60,16 @@ public class TransactionalClientDataSourceOnExceptionRedeliveryTest extends Tran
// marks this route as transacted, and we dont pass in any parameters so we
// will auto lookup and use the Policy defined in the spring XML file
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
// marks this route as transacted that will use the single policy defined in the registry
from("direct:fail")
// marks this route as transacted, and we dont pass in any parameters so we
// will auto lookup and use the Policy defined in the spring XML file
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e1
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java
index 38838d6..66ea9ab 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceRedeliveryTest.java
@@ -65,16 +65,16 @@ public class TransactionalClientDataSourceRedeliveryTest extends TransactionalCl
// marks this route as transacted, and we dont pass in any parameters so we
// will auto lookup and use the Policy defined in the spring XML file
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
// marks this route as transacted that will use the single policy defined in the registry
from("direct:fail")
// marks this route as transacted, and we dont pass in any parameters so we
// will auto lookup and use the Policy defined in the spring XML file
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e1
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
index a3d0c2d..c3d8678 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
@@ -76,13 +76,13 @@ public class TransactionalClientDataSourceTest extends TransactionClientDataSour
// START SNIPPET: e2
// set the required policy for this route
from("direct:okay").policy(required).
- setBody(constant("Tiger in Action")).beanRef("bookService").
- setBody(constant("Elephant in Action")).beanRef("bookService");
+ setBody(constant("Tiger in Action")).bean("bookService").
+ setBody(constant("Elephant in Action")).bean("bookService");
// set the required policy for this route
from("direct:fail").policy(required).
- setBody(constant("Tiger in Action")).beanRef("bookService").
- setBody(constant("Donkey in Action")).beanRef("bookService");
+ setBody(constant("Tiger in Action")).bean("bookService").
+ setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e2
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedTest.java
index 78af400..4dc478e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedTest.java
@@ -32,16 +32,16 @@ public class TransactionalClientDataSourceTransactedTest extends TransactionalCl
// marks this route as transacted, and we dont pass in any parameters so we
// will auto lookup and use the Policy defined in the spring XML file
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
// marks this route as transacted that will use the single policy defined in the registry
from("direct:fail")
// marks this route as transacted, and we dont pass in any parameters so we
// will auto lookup and use the Policy defined in the spring XML file
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e1
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceRedeliveryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceRedeliveryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceRedeliveryTest.java
index 0372b6a..5819f47 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceRedeliveryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceRedeliveryTest.java
@@ -38,21 +38,21 @@ public class TransactionalClientDataSourceTransactedWithChoiceRedeliveryTest ext
.to("log:other")
.end()
.to("direct:tiger")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:tiger")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService");
from("direct:donkey")
// notice this one is not marked as transacted but since the exchange is transacted
// the default error handler will not handle it and thus not interfeer
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Donkey in Action")).bean("bookService");
// marks this route as transacted that will use the single policy defined in the registry
from("direct:fail")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
+ .setBody(constant("Tiger in Action")).bean("bookService")
.to("direct:donkey");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceTest.java
index 8da8122..4e45d54 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithChoiceTest.java
@@ -35,21 +35,21 @@ public class TransactionalClientDataSourceTransactedWithChoiceTest extends Trans
.to("log:other")
.end()
.to("direct:tiger")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:tiger")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService");
from("direct:donkey")
// notice this one is not marked as transacted but since the exchange is transacted
// the default error handler will not handle it and thus not interfeer
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Donkey in Action")).bean("bookService");
// marks this route as transacted that will use the single policy defined in the registry
from("direct:fail")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
+ .setBody(constant("Tiger in Action")).bean("bookService")
.to("direct:donkey");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
index b605c7e..a72e1e6 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
@@ -30,8 +30,8 @@ public class TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest
from("file://target/transacted/okay")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("file://target/transacted/fail?moveFailed=../failed")
.onException(IllegalArgumentException.class)
@@ -39,8 +39,8 @@ public class TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest
.to("mock:error")
.end()
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
index cd294cc..fe03c43 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
@@ -62,13 +62,13 @@ public class TransactionalClientDataSourceTransactedWithFileOnExceptionTest exte
from("file://target/transacted/okay")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("file://target/transacted/fail?moveFailed=../failed")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
index 71bd905..1d33f1e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
@@ -57,13 +57,13 @@ public class TransactionalClientDataSourceTransactedWithFileTest extends Transac
public void configure() throws Exception {
from("file://target/transacted/okay")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("file://target/transacted/fail?delay=1000")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithLocalOnExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithLocalOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithLocalOnExceptionTest.java
index 0b775f4..65c0372 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithLocalOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithLocalOnExceptionTest.java
@@ -34,8 +34,8 @@ public class TransactionalClientDataSourceTransactedWithLocalOnExceptionTest ext
.to("mock:error")
.end()
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
// use local on exception
@@ -44,8 +44,8 @@ public class TransactionalClientDataSourceTransactedWithLocalOnExceptionTest ext
.to("mock:error")
.end()
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactionErrorHandlerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactionErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactionErrorHandlerTest.java
index 27376c7..f58fee8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactionErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactionErrorHandlerTest.java
@@ -33,14 +33,14 @@ public class TransactionalClientDataSourceTransactionErrorHandlerTest extends Tr
from("direct:okay")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
// marks this route as transacted that will use the single policy defined in the registry
from("direct:fail")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e1
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java
index be617b1..2d1f4f4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithNoErrorHandlerConfigureTest.java
@@ -30,13 +30,13 @@ public class TransactionalClientDataSourceWithNoErrorHandlerConfigureTest extend
// START SNIPPET: e1
// set the required policy for this route to indicate its transactional
from("direct:okay").policy("PROPAGATION_REQUIRED").
- setBody(constant("Tiger in Action")).beanRef("bookService").
- setBody(constant("Elephant in Action")).beanRef("bookService");
+ setBody(constant("Tiger in Action")).bean("bookService").
+ setBody(constant("Elephant in Action")).bean("bookService");
// set the required policy for this route to indicate its transactional
from("direct:fail").policy("PROPAGATION_REQUIRED").
- setBody(constant("Tiger in Action")).beanRef("bookService").
- setBody(constant("Donkey in Action")).beanRef("bookService");
+ setBody(constant("Tiger in Action")).bean("bookService").
+ setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e1
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java
index 0b78522..9800492 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest.java
@@ -59,13 +59,13 @@ public class TransactionalClientDataSourceWithOnExceptionHandledAndRollbackTest
from("direct:okay")
.policy(required)
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
.policy(required)
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java
index f688811..d6425c4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsingTransactedTest.java
@@ -46,13 +46,13 @@ public class TransactionalClientDataSourceWithOnExceptionHandledAndRollbackUsing
from("direct:okay")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionMinimalConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionMinimalConfigurationTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionMinimalConfigurationTest.java
index db10534..b67418c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionMinimalConfigurationTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionMinimalConfigurationTest.java
@@ -38,14 +38,14 @@ public class TransactionalClientDataSourceWithOnExceptionMinimalConfigurationTes
from("direct:okay")
// mark this route as transacted
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
// mark this route as transacted
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e1
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java
index 00b09d9..9acd7b0 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionRollbackTest.java
@@ -63,13 +63,13 @@ public class TransactionalClientDataSourceWithOnExceptionRollbackTest extends Tr
from("direct:okay")
.policy(required)
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
.policy(required)
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java
index 8df3fe0..7a5624f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithOnExceptionTest.java
@@ -62,13 +62,13 @@ public class TransactionalClientDataSourceWithOnExceptionTest extends Transactio
from("direct:okay")
.policy(required)
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
from("direct:fail")
.policy(required)
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/10b2ced2/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithTransactedErrorHandlerOnExceptionRedeliveryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithTransactedErrorHandlerOnExceptionRedeliveryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithTransactedErrorHandlerOnExceptionRedeliveryTest.java
index 5d65465..17544c9 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithTransactedErrorHandlerOnExceptionRedeliveryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceWithTransactedErrorHandlerOnExceptionRedeliveryTest.java
@@ -42,16 +42,16 @@ public class TransactionalClientDataSourceWithTransactedErrorHandlerOnExceptionR
// marks this route as transacted, and we dont pass in any parameters so we
// will auto lookup and use the Policy defined in the spring XML file
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Elephant in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Elephant in Action")).bean("bookService");
// marks this route as transacted that will use the single policy defined in the registry
from("direct:fail")
// marks this route as transacted, and we dont pass in any parameters so we
// will auto lookup and use the Policy defined in the spring XML file
.transacted()
- .setBody(constant("Tiger in Action")).beanRef("bookService")
- .setBody(constant("Donkey in Action")).beanRef("bookService");
+ .setBody(constant("Tiger in Action")).bean("bookService")
+ .setBody(constant("Donkey in Action")).bean("bookService");
// END SNIPPET: e1
}
};
[5/7] camel git commit: CAMEL-8459: Java DSL - Align beanRef as bean
to be similar to xml dsl
Posted by da...@apache.org.
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");
[4/7] camel git commit: Upgrade RX
Posted by da...@apache.org.
Upgrade RX
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a299039a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a299039a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a299039a
Branch: refs/heads/master
Commit: a299039abcc3f843a4cad2be6b5aa73e0fa7b391
Parents: bc31c6b
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 7 15:52:31 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 8 07:18:16 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a299039a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2596410..dbf0569 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -392,7 +392,7 @@
<rhino-version>1.7R2</rhino-version>
<rome-bundle-version>1.0_3</rome-bundle-version>
<rome-version>1.0</rome-version>
- <rxjava-version>1.0.7</rxjava-version>
+ <rxjava-version>1.0.8</rxjava-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.5.1-5_1</saxon-bundle-version>
<saxon-version>9.5.1-5</saxon-version>
[6/7] camel git commit: CAMEL-8459: Java DSL - Align beanRef as bean
to be similar to xml dsl
Posted by da...@apache.org.
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/a5473007
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a5473007
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a5473007
Branch: refs/heads/master
Commit: a547300711ce7b688be8e24dd794ce8a8eb89f79
Parents: a299039
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 7 16:19:41 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 8 07:18:16 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/model/BeanDefinition.java | 2 +-
.../camel/processor/BeanValidateTypeTest.java | 66 --------------------
2 files changed, 1 insertion(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a5473007/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
index b1e77e8..d3733ed 100644
--- a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
@@ -285,7 +285,7 @@ public class BeanDefinition extends NoOutputDefinition<BeanDefinition> {
// to a bean name but the String is being invoke instead
if (bean instanceof String) {
throw new IllegalArgumentException("The bean instance is a java.lang.String type: " + bean
- + ". We suppose you want to refer to a bean instance by its id instead. Please use beanRef.");
+ + ". We suppose you want to refer to a bean instance by its id instead. Please use ref.");
}
// the holder should either be bean or type based
http://git-wip-us.apache.org/repos/asf/camel/blob/a5473007/camel-core/src/test/java/org/apache/camel/processor/BeanValidateTypeTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanValidateTypeTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanValidateTypeTest.java
deleted file mode 100644
index 143d040..0000000
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanValidateTypeTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.processor;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
-
-/**
- * @version
- */
-public class BeanValidateTypeTest extends ContextTestSupport {
-
- public static class MyCoolBean {
-
- public String hello(String s) {
- return "Hello " + s;
- }
-
- }
-
- @Override
- public boolean isUseRouteBuilder() {
- return false;
- }
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("cool", new MyCoolBean());
- return jndi;
- }
-
- public void testBeanValidateType() throws Exception {
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- // we should use beanRef instead to refer to cool
- from("direct:start").bean("cool");
- }
- });
- try {
- context.start();
- fail("Should have thrown exception");
- } catch (FailedToCreateRouteException e) {
- assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
- assertTrue(e.getCause().getMessage().startsWith("The bean instance is a java.lang.String type: cool."));
- }
- }
-
-}
[3/7] camel git commit: CAMEL-8459: Java DSL - Align beanRef as bean
to be similar to xml dsl
Posted by da...@apache.org.
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/ee8af5e8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ee8af5e8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ee8af5e8
Branch: refs/heads/master
Commit: ee8af5e8157e7595b031b83500cc9c02b7f5c679
Parents: e29267f
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 7 15:34:01 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 8 07:18:15 2015 +0100
----------------------------------------------------------------------
.../apache/camel/model/ProcessorDefinition.java | 88 +++++++++++++++++---
...ethodWithMatchingTypeAndSkipSettersTest.java | 2 +-
.../bean/BeanExplicitMethodAmbiguousTest.java | 6 +-
.../component/bean/BeanExplicitMethodTest.java | 2 +-
.../bean/BeanInfoSelectMethodTest.java | 4 +-
.../BeanLookupUsingJndiRegistryIssueTest.java | 2 +-
.../camel/component/bean/BeanMapPutTest.java | 2 +-
.../bean/BeanRefMethodNotFoundTest.java | 4 +-
.../component/bean/BeanRefNoCacheTest.java | 2 +-
.../component/bean/BeanRefNotFoundTest.java | 4 +-
...BeanWithExchangeExceptionAnnotationTest.java | 4 +-
...eanWithExpressionInjectionPredicateTest.java | 2 +-
.../bean/BeanWithExpressionInjectionTest.java | 2 +-
.../bean/BeanWithMethodHeaderTest.java | 10 +--
...ropertiesAndHeadersAndBodyInjectionTest.java | 2 +-
...anWithPropertiesAndHeadersInjectionTest.java | 2 +-
...BodyAnnotationToDisambiguateMethodsTest.java | 2 +-
.../CustomParameterMappingStrategyTest.java | 2 +-
.../DefaultParameterMappingStrategyTest.java | 12 +--
...sionAnnotationToDisambiguateMethodsTest.java | 4 +-
.../camel/component/bean/NewInstanceTest.java | 2 +-
.../issues/BeanVsProcessorPerformanceTest.java | 2 +-
.../camel/component/file/ToFileRouteTest.java | 2 +-
.../camel/component/mock/MockAsBeanTest.java | 2 +-
.../XsltFromHeaderOverrideEndpointUriTest.java | 2 +-
.../component/xslt/XsltRouteAllowStAXTest.java | 2 +-
.../camel/component/xslt/XsltRouteFileTest.java | 2 +-
.../camel/component/xslt/XsltRouteTest.java | 2 +-
.../java/org/apache/camel/main/MainExample.java | 2 +-
.../model/ProcessorTypeConfigurationTest.java | 2 +-
.../model/StartingRoutesErrorReportedTest.java | 2 +-
.../BeanRecipientListNoMethodNameTest.java | 2 +-
.../camel/processor/BeanRecipientListTest.java | 2 +-
.../processor/BeanRecipientListTimeoutTest.java | 2 +-
.../apache/camel/processor/BeanRouteTest.java | 2 +-
.../camel/processor/BeanWithExceptionTest.java | 2 +-
.../processor/BeanWithXPathInjectionTest.java | 2 +-
...DefaultErrorHandlerOnExceptionTraceTest.java | 2 +-
.../processor/OnCompletionGlobalTraceTest.java | 2 +-
.../processor/RecipientListReturnValueTest.java | 2 +-
...regateForceCompletionOnStopParallelTest.java | 4 +-
.../AggregateForceCompletionOnStopTest.java | 4 +-
.../AsyncEndpointRecipientListBean3Test.java | 2 +-
.../AsyncEndpointRecipientListBean4Test.java | 2 +-
.../AsyncEndpointRecipientListBeanTest.java | 2 +-
.../AsyncEndpointRoutingSlipBean2Test.java | 2 +-
.../AsyncEndpointRoutingSlipBean3Test.java | 2 +-
.../async/AsyncEndpointRoutingSlipBeanTest.java | 2 +-
.../java/org/apache/camel/view/DotViewTest.java | 2 +-
49 files changed, 144 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 7d440f8..997b604 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -2456,6 +2456,24 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
*/
@SuppressWarnings("unchecked")
+ public Type process(String ref) {
+ ProcessDefinition answer = new ProcessDefinition();
+ answer.setRef(ref);
+ addOutput(answer);
+ return (Type) this;
+ }
+
+ /**
+ * <a href="http://camel.apache.org/message-translator.html">Message Translator EIP:</a>
+ * Adds the custom processor reference to this destination which could be a final
+ * destination, or could be a transformation in a pipeline
+ *
+ * @param ref reference to a {@link Processor} to lookup in the registry
+ * @return the builder
+ * @deprecated use {@link #process(String)}
+ */
+ @SuppressWarnings("unchecked")
+ @Deprecated
public Type processRef(String ref) {
ProcessDefinition answer = new ProcessDefinition();
answer.setRef(ref);
@@ -2467,13 +2485,17 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* <a href="http://camel.apache.org/message-translator.html">Message Translator EIP:</a>
* Adds a bean which is invoked which could be a final destination, or could be a transformation in a pipeline
*
- * @param bean the bean to invoke
+ * @param bean the bean to invoke, or a reference to a bean if the type is a String
* @return the builder
*/
@SuppressWarnings("unchecked")
public Type bean(Object bean) {
BeanDefinition answer = new BeanDefinition();
- answer.setBean(bean);
+ if (bean instanceof String) {
+ answer.setRef((String) bean);
+ } else {
+ answer.setBean(bean);
+ }
addOutput(answer);
return (Type) this;
}
@@ -2482,14 +2504,18 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* <a href="http://camel.apache.org/message-translator.html">Message Translator EIP:</a>
* Adds a bean which is invoked which could be a final destination, or could be a transformation in a pipeline
*
- * @param bean the bean to invoke
+ * @param bean the bean to invoke, or a reference to a bean if the type is a String
* @param method the method name to invoke on the bean (can be used to avoid ambiguity)
* @return the builder
*/
@SuppressWarnings("unchecked")
public Type bean(Object bean, String method) {
BeanDefinition answer = new BeanDefinition();
- answer.setBean(bean);
+ if (bean instanceof String) {
+ answer.setRef((String) bean);
+ } else {
+ answer.setBean(bean);
+ }
answer.setMethod(method);
addOutput(answer);
return (Type) this;
@@ -2499,18 +2525,46 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* <a href="http://camel.apache.org/message-translator.html">Message Translator EIP:</a>
* Adds a bean which is invoked which could be a final destination, or could be a transformation in a pipeline
*
- * @param bean the bean to invoke
+ * @param bean the bean to invoke, or a reference to a bean if the type is a String
+ * @param cache if enabled, Camel will cache the result of the first Registry look-up.
+ * Cache can be enabled if the bean in the Registry is defined as a singleton scope.
+ * the multi parameter
+ * @return the builder
+ */
+ @SuppressWarnings("unchecked")
+ public Type bean(Object bean, boolean cache) {
+ BeanDefinition answer = new BeanDefinition();
+ if (bean instanceof String) {
+ answer.setRef((String) bean);
+ } else {
+ answer.setBean(bean);
+ }
+ answer.setCache(cache);
+ addOutput(answer);
+ return (Type) this;
+ }
+
+ /**
+ * <a href="http://camel.apache.org/message-translator.html">Message Translator EIP:</a>
+ * Adds a bean which is invoked which could be a final destination, or could be a transformation in a pipeline
+ *
+ * @param bean the bean to invoke, or a reference to a bean if the type is a String
* @param method the method name to invoke on the bean (can be used to avoid ambiguity)
- * @param multiParameterArray if it is true, camel will treat the message body as an object array which holds
- * the multi parameter
+ * @param cache if enabled, Camel will cache the result of the first Registry look-up.
+ * Cache can be enabled if the bean in the Registry is defined as a singleton scope.
+ * the multi parameter
* @return the builder
*/
@SuppressWarnings("unchecked")
- public Type bean(Object bean, String method, boolean multiParameterArray) {
+ public Type bean(Object bean, String method, boolean cache) {
BeanDefinition answer = new BeanDefinition();
- answer.setBean(bean);
+ if (bean instanceof String) {
+ answer.setRef((String) bean);
+ } else {
+ answer.setBean(bean);
+ }
answer.setMethod(method);
- answer.setMultiParameterArray(multiParameterArray);
+ answer.setCache(cache);
addOutput(answer);
return (Type) this;
}
@@ -2556,8 +2610,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param multiParameterArray if it is true, camel will treat the message body as an object array which holds
* the multi parameter
* @return the builder
+ * @deprecated the option multiParameterArray is deprecated
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type bean(Class<?> beanType, String method, boolean multiParameterArray) {
BeanDefinition answer = new BeanDefinition();
answer.setBeanType(beanType);
@@ -2578,8 +2634,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param cache if enabled, Camel will cache the result of the first Registry look-up.
* Cache can be enabled if the bean in the Registry is defined as a singleton scope.
* @return the builder
+ * @deprecated the option multiParameterArray is deprecated
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type bean(Class<?> beanType, String method, boolean multiParameterArray, boolean cache) {
BeanDefinition answer = new BeanDefinition();
answer.setBeanType(beanType);
@@ -2596,8 +2654,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*
* @param ref reference to a bean to lookup in the registry
* @return the builder
+ * @deprecated use {@link #bean(Object)}
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type beanRef(String ref) {
BeanDefinition answer = new BeanDefinition(ref);
addOutput(answer);
@@ -2611,8 +2671,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param ref reference to a bean to lookup in the registry
* @param method the method name to invoke on the bean (can be used to avoid ambiguity)
* @return the builder
+ * @deprecated use {@link #bean(Object, String)}
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type beanRef(String ref, String method) {
BeanDefinition answer = new BeanDefinition(ref, method);
addOutput(answer);
@@ -2627,8 +2689,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param cache if enabled, Camel will cache the result of the first Registry look-up.
* Cache can be enabled if the bean in the Registry is defined as a singleton scope.
* @return the builder
+ * @deprecated use {@link #bean(Object, String, boolean)}
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type beanRef(String ref, boolean cache) {
BeanDefinition answer = new BeanDefinition(ref);
answer.setCache(cache);
@@ -2645,8 +2709,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param cache if enabled, Camel will cache the result of the first Registry look-up.
* Cache can be enabled if the bean in the Registry is defined as a singleton scope.
* @return the builder
+ * @deprecated use {@link #bean(Object, String, boolean)}
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type beanRef(String ref, String method, boolean cache) {
BeanDefinition answer = new BeanDefinition(ref, method);
answer.setCache(cache);
@@ -2665,8 +2731,10 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param multiParameterArray if it is true, camel will treat the message body as an object array which holds
* the multi parameter
* @return the builder
+ * @deprecated the option multiParameterArray is deprecated
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public Type beanRef(String ref, String method, boolean cache, boolean multiParameterArray) {
BeanDefinition answer = new BeanDefinition(ref, method);
answer.setCache(cache);
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
index 2e10168..0344b7d 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
@@ -79,7 +79,7 @@ public class BeanChoseMethodWithMatchingTypeAndSkipSettersTest extends ContextTe
@Override
public void configure() throws Exception {
from("file://target/file/order", "seda:xml")
- .beanRef("orderService")
+ .bean("orderService")
.to("mock:queue:order");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
index ae0f9cf..a0d79f9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodAmbiguousTest.java
@@ -64,11 +64,11 @@ public class BeanExplicitMethodAmbiguousTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:hello").beanRef("dummy", "hello", true);
+ from("direct:hello").bean("dummy", "hello", true);
- from("direct:bye").beanRef("dummy", true);
+ from("direct:bye").bean("dummy", true);
- from("direct:foo").beanRef("dummy", "bar", true);
+ from("direct:foo").bean("dummy", "bar", true);
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
index 2a156a0..c689972 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanExplicitMethodTest.java
@@ -57,7 +57,7 @@ public class BeanExplicitMethodTest extends ContextTestSupport {
@Override
public void configure() throws Exception {
from("direct:start")
- .beanRef("foo", "echo")
+ .bean("foo", "echo")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
index e3918ed..99c93f9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoSelectMethodTest.java
@@ -60,9 +60,9 @@ public class BeanInfoSelectMethodTest extends ContextTestSupport {
public void configure() throws Exception {
errorHandler(deadLetterChannel("mock:error").logStackTrace(false).maximumRedeliveries(3));
- onException(Exception.class).handled(true).beanRef("foo", "handleFailure").to("mock:result");
+ onException(Exception.class).handled(true).bean("foo", "handleFailure").to("mock:result");
- from("direct:a").beanRef("foo").to("mock:result");
+ from("direct:a").bean("foo").to("mock:result");
from("direct:b").to("mock:foo");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
index 1ff7410..33922fb 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanLookupUsingJndiRegistryIssueTest.java
@@ -35,7 +35,7 @@ public class BeanLookupUsingJndiRegistryIssueTest extends TestCase {
camel.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:start").beanRef("foo");
+ from("direct:start").bean("foo");
}
});
camel.start();
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
index d6c9fd8..ae6eed6 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
@@ -52,7 +52,7 @@ public class BeanMapPutTest extends ContextTestSupport {
@Override
public void configure() throws Exception {
from("direct:start")
- .beanRef("myMap", "put('isMaster','true')");
+ .bean("myMap", "put('isMaster','true')");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
index 6d108af..0c3e1ba 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
@@ -37,9 +37,9 @@ public class BeanRefMethodNotFoundTest extends ContextTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:a").routeId("a").beanRef("foo", "hello").to("mock:a");
+ from("direct:a").routeId("a").bean("foo", "hello").to("mock:a");
- from("direct:b").routeId("b").beanRef("foo", "bye").to("mock:b");
+ from("direct:b").routeId("b").bean("foo", "bye").to("mock:b");
}
});
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
index db2b4a9..cb576a3 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNoCacheTest.java
@@ -44,7 +44,7 @@ public class BeanRefNoCacheTest extends ContextTestSupport {
@Override
public void configure() throws Exception {
from("direct:start")
- .beanRef(MyCoolBean.class.getName(), "doSomething", false)
+ .bean(MyCoolBean.class.getName(), "doSomething", false)
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
index 2b1bf3b..55cc806 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefNotFoundTest.java
@@ -38,9 +38,9 @@ public class BeanRefNotFoundTest extends ContextTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:a").routeId("a").beanRef("foo").to("mock:a");
+ from("direct:a").routeId("a").bean("foo").to("mock:a");
- from("direct:b").routeId("b").beanRef("bar").to("mock:b");
+ from("direct:b").routeId("b").bean("bar").to("mock:b");
}
});
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
index 8a7092f..635b8f8 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExchangeExceptionAnnotationTest.java
@@ -54,11 +54,11 @@ public class BeanWithExchangeExceptionAnnotationTest extends ContextTestSupport
onException(MyCustomException.class).
maximumRedeliveries(0).
handled(true).
- beanRef("myBean", "handleException").
+ bean("myBean", "handleException").
to("mock:error");
from("direct:start").
- beanRef("myBean", "throwException").
+ bean("myBean", "throwException").
to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
index 62529c6..aff444e 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
@@ -53,7 +53,7 @@ public class BeanWithExpressionInjectionPredicateTest extends ContextTestSupport
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
index e7149ef..6327e63 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
@@ -52,7 +52,7 @@ public class BeanWithExpressionInjectionTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
index 34ac016..c1ad432 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
@@ -94,7 +94,7 @@ public class BeanWithMethodHeaderTest extends ContextTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:typo").beanRef("myBean", "ups").to("mock:result");
+ from("direct:typo").bean("myBean", "ups").to("mock:result");
}
});
fail("Should throw an exception");
@@ -134,13 +134,13 @@ public class BeanWithMethodHeaderTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:echo").beanRef("myBean", "echo").to("mock:result");
+ from("direct:echo").bean("myBean", "echo").to("mock:result");
- from("direct:hi").beanRef("myBean", "hi").to("mock:result");
+ from("direct:hi").bean("myBean", "hi").to("mock:result");
- from("direct:mixed").beanRef("myBean", "echo").beanRef("myBean", "hi").to("mock:result");
+ from("direct:mixed").bean("myBean", "echo").bean("myBean", "hi").to("mock:result");
- from("direct:fail").beanRef("myBean").to("mock:result");
+ from("direct:fail").bean("myBean").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
index 9345d0f..f7485c9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
@@ -73,7 +73,7 @@ public class BeanWithPropertiesAndHeadersAndBodyInjectionTest extends ContextTes
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
index a18b18f..551f039 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
@@ -73,7 +73,7 @@ public class BeanWithPropertiesAndHeadersInjectionTest extends ContextTestSuppor
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
index 8da60f2..96862e9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
@@ -51,7 +51,7 @@ public class BodyAnnotationToDisambiguateMethodsTest extends ContextTestSupport
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
index c986ec4..043c4c4 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
@@ -47,7 +47,7 @@ public class CustomParameterMappingStrategyTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:a").beanRef("foo").to("mock:result");
+ from("direct:a").bean("foo").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
index a47bba0..eba5dac 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
@@ -86,19 +86,19 @@ public class DefaultParameterMappingStrategyTest extends ContextTestSupport {
public void configure() throws Exception {
errorHandler(deadLetterChannel("mock:error").logStackTrace(false).disableRedelivery());
- onException(Exception.class).handled(true).beanRef("foo", "withException").to("mock:result");
+ onException(Exception.class).handled(true).bean("foo", "withException").to("mock:result");
- from("direct:a").beanRef("foo", "withExchange").to("mock:result");
+ from("direct:a").bean("foo", "withExchange").to("mock:result");
- from("direct:b").beanRef("foo", "withMessage").to("mock:result");
+ from("direct:b").bean("foo", "withMessage").to("mock:result");
from("direct:c").to("mock:foo");
- from("direct:d").beanRef("foo", "withTypeConverter").to("mock:result");
+ from("direct:d").bean("foo", "withTypeConverter").to("mock:result");
- from("direct:e").beanRef("foo", "withRegistry").to("mock:result");
+ from("direct:e").bean("foo", "withRegistry").to("mock:result");
- from("direct:f").beanRef("foo", "withCamelContext").to("mock:result");
+ from("direct:f").bean("foo", "withCamelContext").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
index 2d4271e..02e87c8 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
@@ -58,9 +58,9 @@ public class ExpressionAnnotationToDisambiguateMethodsTest extends ContextTestSu
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
- from("direct:other").beanRef("myOtherBean");
+ from("direct:other").bean("myOtherBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
index 188c066..0ac4bb6 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
@@ -60,7 +60,7 @@ public class NewInstanceTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:start").beanRef("myBean", false).to("mock:result");
+ from("direct:start").bean("myBean", false).to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
index 0f8a853..ca1bc85 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanVsProcessorPerformanceTest.java
@@ -66,7 +66,7 @@ public class BeanVsProcessorPerformanceTest extends ContextTestSupport {
.process(new MyLittleProcessor());
from("direct:b")
- .beanRef("myLittleBean", "bye");
+ .bean("myLittleBean", "bye");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java b/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
index 2a68d52..6bc75c9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
@@ -51,7 +51,7 @@ public class ToFileRouteTest extends ContextTestSupport {
public void configure() throws Exception {
// the reports from the seda queue is processed by our processor
// before they are written to files in the target/reports directory
- from("direct:reports").processRef("processReport").to("file://target/test-reports", "mock:result");
+ from("direct:reports").process("processReport").to("file://target/test-reports", "mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java b/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
index bbe9aee..8b87134 100644
--- a/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
@@ -67,7 +67,7 @@ public class MockAsBeanTest extends ContextTestSupport {
public void configure() throws Exception {
from("direct:start")
// send to foo bean
- .beanRef("foo")
+ .bean("foo")
// and then to result mock
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
index 0eb6c26..fe2dceb 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
@@ -63,7 +63,7 @@ public class XsltFromHeaderOverrideEndpointUriTest extends ContextTestSupport {
from("direct:start")
.to("xslt:org/apache/camel/component/xslt/transform.xsl")
.multicast()
- .beanRef("testBean")
+ .bean("testBean")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java
index 72787c5..84c7d29 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java
@@ -31,7 +31,7 @@ public class XsltRouteAllowStAXTest extends XsltRouteTest {
from("direct:start")
.to("xslt:org/apache/camel/component/xslt/transform.xsl?allowStAX=true")
.multicast()
- .beanRef("testBean")
+ .bean("testBean")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteFileTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteFileTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteFileTest.java
index dca1172..c2ef4da 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteFileTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteFileTest.java
@@ -31,7 +31,7 @@ public class XsltRouteFileTest extends XsltRouteTest {
from("direct:start")
.to("xslt:file:src/test/resources/org/apache/camel/component/xslt/transform.xsl")
.multicast()
- .beanRef("testBean")
+ .bean("testBean")
.to("mock:result");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
index 62d2be8..462415f 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
@@ -76,7 +76,7 @@ public class XsltRouteTest extends ContextTestSupport {
from("direct:start")
.to("xslt:org/apache/camel/component/xslt/transform.xsl")
.multicast()
- .beanRef("testBean")
+ .bean("testBean")
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/main/MainExample.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/main/MainExample.java b/camel-core/src/test/java/org/apache/camel/main/MainExample.java
index f081aac..8e30738 100644
--- a/camel-core/src/test/java/org/apache/camel/main/MainExample.java
+++ b/camel-core/src/test/java/org/apache/camel/main/MainExample.java
@@ -59,7 +59,7 @@ public class MainExample {
System.out.println("Invoked timer at " + new Date());
}
})
- .beanRef("foo");
+ .bean("foo");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java b/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
index 4e93ab8..aa4aee9 100644
--- a/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
@@ -29,7 +29,7 @@ public class ProcessorTypeConfigurationTest extends ContextTestSupport {
try {
context.addRoutes(new RouteBuilder() {
public void configure() throws Exception {
- from("direct:in").processRef("hello");
+ from("direct:in").process("hello");
}
});
fail("Should have thrown IllegalArgumentException");
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java b/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
index 6e1afcc..e9beb08 100644
--- a/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
+++ b/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
@@ -63,7 +63,7 @@ public class StartingRoutesErrorReportedTest extends ContextTestSupport {
public void configure() throws Exception {
from("direct:start").routeId("route3")
.to("mock:foo")
- .beanRef("");
+ .bean("");
}
});
context.start();
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java
index e80fb51..deb135f 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListNoMethodNameTest.java
@@ -26,7 +26,7 @@ public class BeanRecipientListNoMethodNameTest extends BeanRecipientListTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
index ef27ab4..67a7c69 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
@@ -65,7 +65,7 @@ public class BeanRecipientListTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean", "route");
+ from("direct:in").bean("myBean", "route");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTimeoutTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTimeoutTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTimeoutTest.java
index f30be22..4b20357 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTimeoutTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTimeoutTest.java
@@ -62,7 +62,7 @@ public class BeanRecipientListTimeoutTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:start").beanRef("myBean", "route").to("mock:result");
+ from("direct:start").bean("myBean", "route").to("mock:result");
from("direct:a").delay(2000).setBody(constant("A"));
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
index 858f521..af20075 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
@@ -74,7 +74,7 @@ public class BeanRouteTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java
index e712d1b..adaf5ca 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java
@@ -91,7 +91,7 @@ public class BeanWithExceptionTest extends ContextTestSupport {
public void configure() {
onException(ValidationException.class).to("mock:invalid");
- from("direct:start").beanRef("myBean").to("mock:valid");
+ from("direct:start").bean("myBean").to("mock:valid");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
index 6c624c3..20b6802 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
@@ -72,7 +72,7 @@ public class BeanWithXPathInjectionTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:in").beanRef("myBean");
+ from("direct:in").bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java b/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java
index b4402ea..4ec4441 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java
@@ -96,7 +96,7 @@ public class DefaultErrorHandlerOnExceptionTraceTest extends ContextTestSupport
onException(IllegalArgumentException.class).handled(true).to("log:boom").to("mock:boom");
- from("direct:start").processRef("myProcessor").to("mock:result");
+ from("direct:start").process("myProcessor").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java b/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java
index 48be466..45d9329 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java
@@ -113,7 +113,7 @@ public class OnCompletionGlobalTraceTest extends ContextTestSupport {
onCompletion().to("log:global").to("mock:sync");
from("direct:start")
- .processRef("myProcessor")
+ .process("myProcessor")
.to("mock:result");
// END SNIPPET: e1
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java b/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
index d312fd3..9627fcb 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
@@ -63,7 +63,7 @@ public class RecipientListReturnValueTest extends ContextTestSupport {
public void configure() {
getContext().addInterceptStrategy(new Tracer());
- from("direct:beanRef").beanRef("myBean", "route");
+ from("direct:beanRef").bean("myBean", "route");
from("direct:recipientList").recipientList().method("myBean", "recipientList");
from("direct:a").transform(constant("Hello a")).to("mock:a");
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopParallelTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopParallelTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopParallelTest.java
index 9060ce4..36f8813 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopParallelTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopParallelTest.java
@@ -32,12 +32,12 @@ public class AggregateForceCompletionOnStopParallelTest extends AggregateForceCo
from("direct:forceCompletionTrue").routeId("foo")
.aggregate(header("id"), new BodyInAggregatingStrategy()).forceCompletionOnStop().completionSize(10).parallelProcessing()
.delay(100)
- .processRef("myCompletionProcessor");
+ .process("myCompletionProcessor");
from("direct:forceCompletionFalse").routeId("bar")
.aggregate(header("id"), new BodyInAggregatingStrategy()).completionSize(10).parallelProcessing()
.delay(100)
- .processRef("myCompletionProcessor");
+ .process("myCompletionProcessor");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java
index 77f757c..e071a08 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateForceCompletionOnStopTest.java
@@ -110,12 +110,12 @@ public class AggregateForceCompletionOnStopTest extends ContextTestSupport {
from("direct:forceCompletionTrue").routeId("foo")
.aggregate(header("id"), new BodyInAggregatingStrategy()).forceCompletionOnStop().completionSize(10)
.delay(100)
- .processRef("myCompletionProcessor");
+ .process("myCompletionProcessor");
from("direct:forceCompletionFalse").routeId("bar")
.aggregate(header("id"), new BodyInAggregatingStrategy()).completionSize(10)
.delay(100)
- .processRef("myCompletionProcessor");
+ .process("myCompletionProcessor");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
index aec9bb8..3308068 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
@@ -64,7 +64,7 @@ public class AsyncEndpointRecipientListBean3Test extends ContextTestSupport {
beforeThreadName = Thread.currentThread().getName();
}
})
- .beanRef("myBean");
+ .bean("myBean");
from("direct:foo")
.process(new Processor() {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
index 1653b23..e30ed93 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
@@ -64,7 +64,7 @@ public class AsyncEndpointRecipientListBean4Test extends ContextTestSupport {
beforeThreadName = Thread.currentThread().getName();
}
})
- .beanRef("myBean");
+ .bean("myBean");
from("direct:foo")
.process(new Processor() {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBeanTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBeanTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBeanTest.java
index 6ff1724..07955ec 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBeanTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBeanTest.java
@@ -64,7 +64,7 @@ public class AsyncEndpointRecipientListBeanTest extends ContextTestSupport {
beforeThreadName = Thread.currentThread().getName();
}
})
- .beanRef("myBean")
+ .bean("myBean")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java
index 084cda5..5e056c6 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean2Test.java
@@ -46,7 +46,7 @@ public class AsyncEndpointRoutingSlipBean2Test extends ContextTestSupport {
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .beanRef("myBean");
+ .bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
index 1b3c267..920e41c 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
@@ -66,7 +66,7 @@ public class AsyncEndpointRoutingSlipBean3Test extends ContextTestSupport {
beforeThreadName = Thread.currentThread().getName();
}
})
- .beanRef("myBean");
+ .bean("myBean");
from("direct:foo")
.process(new Processor() {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java
index 95439dc..e70ad9b 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanTest.java
@@ -50,7 +50,7 @@ public class AsyncEndpointRoutingSlipBeanTest extends ContextTestSupport {
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .beanRef("myBean");
+ .bean("myBean");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ee8af5e8/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java b/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
index 7b5980f..625ae0b 100644
--- a/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
+++ b/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
@@ -85,7 +85,7 @@ public class DotViewTest extends ContextTestSupport {
static class FromToBeanRoute extends RouteBuilder {
public void configure() throws Exception {
- from("seda:foo2").beanRef("myBean", "hello");
+ from("seda:foo2").bean("myBean", "hello");
}
}
[7/7] camel git commit: Fixed builder order in root pom to build
tooling before platform which must happen in that order
Posted by da...@apache.org.
Fixed builder order in root pom to build tooling before platform which must happen in that order
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cfab63a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cfab63a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cfab63a5
Branch: refs/heads/master
Commit: cfab63a588e0461e67a2f93a1bb99cdde560b02e
Parents: a547300
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 8 08:22:01 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 8 08:22:01 2015 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cfab63a5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f8834a5..0af8484 100755
--- a/pom.xml
+++ b/pom.xml
@@ -121,14 +121,14 @@
<modules>
<module>parent</module>
+ <module>etc</module>
<module>buildingtools</module>
<module>camel-core</module>
<module>components</module>
- <module>platforms</module>
<module>tooling</module>
+ <module>platforms</module>
<module>tests</module>
<module>examples</module>
- <module>etc</module>
</modules>
<scm>