Repository: camel Updated Branches: refs/heads/master f39b5446e -> 2e1f1cd9d
CAMEL-7628: Fixed tests. Thanks to Nikolay Turpitko for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e1f1cd9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e1f1cd9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e1f1cd9 Branch: refs/heads/master Commit: 2e1f1cd9d06a191c11b3dca94b858387ded7c5fb Parents: f39b544 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 27 09:04:05 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 27 09:04:05 2014 +0200 ---------------------------------------------------------------------- .../component/quartz2/SpringQuartzPersistentStoreRestartTest.xml | 4 ++-- .../camel/component/quartz2/SpringQuartzPersistentStoreTest.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2e1f1cd9/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml index 410968d..1a4b6a6 100644 --- a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml +++ b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml @@ -29,7 +29,7 @@ <!-- do not load script as database alreaady exists --> </jdbc:embedded-database> - <bean id="quartz" class="org.apache.camel.component.quartz2.QuartzComponent"> + <bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent"> <property name="scheduler" ref="scheduler"/> </bean> @@ -41,7 +41,7 @@ <property name="schedulerContextAsMap"> <!-- hook Camel into Quartz --> <map> - <entry key="CamelQuartzCamelContext" value-ref="camelContext"/> + <entry key="CamelQuartzCamelContext-camelContext" value-ref="camelContext"/> </map> </property> <property name="quartzProperties"> http://git-wip-us.apache.org/repos/asf/camel/blob/2e1f1cd9/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml index e5605b9..b37ac8f 100644 --- a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml +++ b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml @@ -29,7 +29,7 @@ <jdbc:script location="classpath:tables_derby.sql"/> </jdbc:embedded-database> - <bean id="quartz" class="org.apache.camel.component.quartz2.QuartzComponent"> + <bean id="quartz2" class="org.apache.camel.component.quartz2.QuartzComponent"> <property name="scheduler" ref="scheduler"/> </bean> @@ -41,7 +41,7 @@ <property name="schedulerContextAsMap"> <!-- hook Camel into Quartz --> <map> - <entry key="CamelQuartzCamelContext" value-ref="camelContext"/> + <entry key="CamelQuartzCamelContext-camelContext" value-ref="camelContext"/> </map> </property> <property name="quartzProperties">
