Updated Branches: refs/heads/camel-2.11.x 6ce6f2b97 -> f79a58a94
Better avoid clashing of id's for CamelContexts. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f79a58a9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f79a58a9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f79a58a9 Branch: refs/heads/camel-2.11.x Commit: f79a58a945ca8552c1e5281b00658014e91ebf1f Parents: 6ce6f2b Author: Babak Vahdat <[email protected]> Authored: Sat Sep 28 22:30:43 2013 +0200 Committer: Babak Vahdat <[email protected]> Committed: Sat Sep 28 22:33:02 2013 +0200 ---------------------------------------------------------------------- .../quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java | 2 +- .../component/quartz/SpringQuartzConsumerClusteredAppTwo.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f79a58a9/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java index 3139950..9a5efdb 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java @@ -75,7 +75,7 @@ public class SpringQuartzConsumerTwoAppsClusteredFailoverTest extends TestSuppor // 2013-09-28 19:50:58,892 [_ClusterManager] INFO LocalDataSourceJobStore - ClusterManager: Scanning for instance "app-one"'s failed in-progress jobs. // 2013-09-28 19:50:58,913 [eduler_Worker-1] INFO triggered - Exchange[ExchangePattern: InOnly, BodyType: String, Body: clustering PONGS!] - CamelContext camel2 = app2.getBean("camelContext", CamelContext.class); + CamelContext camel2 = app2.getBean("camelContext2", CamelContext.class); MockEndpoint mock2 = camel2.getEndpoint("mock:result", MockEndpoint.class); mock2.expectedMinimumMessageCount(3); http://git-wip-us.apache.org/repos/asf/camel/blob/f79a58a9/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml index 784c2bb..fa7921d 100644 --- a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml +++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml @@ -41,7 +41,7 @@ <property name="schedulerContextAsMap"> <!-- hook Camel into Quartz --> <map> - <entry key="CamelQuartzCamelContext-camelContext" value-ref="camelContext"/> + <entry key="CamelQuartzCamelContext-camelContext" value-ref="camelContext2"/> </map> </property> <property name="quartzProperties"> @@ -56,7 +56,7 @@ </property> </bean> - <camelContext id="camelContext" xmlns="http://camel.apache.org/schema/spring";> + <camelContext id="camelContext2" xmlns="http://camel.apache.org/schema/spring";> <template id="template" /> <route id="myRoute"> <from uri="quartz://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1" />
