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:38 UTC
[2/7] camel git commit: CAMEL-8459: Java DSL - Align beanRef as bean
to be similar to xml dsl
CAMEL-8459: Java DSL - Align beanRef as bean to be similar to xml dsl
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/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
}
};