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 2014/03/02 09:59:28 UTC
git commit: CAMEL-7156: SpringCamelContext should shutdown eager to
shutdown cleanly. Introduced shutdownEager option to turn back old behavior
for special use-case relying on old way.
Repository: camel
Updated Branches:
refs/heads/master 490f84eb5 -> 3cdc6fd01
CAMEL-7156: SpringCamelContext should shutdown eager to shutdown cleanly. Introduced shutdownEager option to turn back old behavior for special use-case relying on old way.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3cdc6fd0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3cdc6fd0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3cdc6fd0
Branch: refs/heads/master
Commit: 3cdc6fd01ce8d32faf70a638b909e4f7d832166c
Parents: 490f84e
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 2 10:01:35 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 2 10:01:35 2014 +0100
----------------------------------------------------------------------
.../camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml | 2 +-
.../camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml | 2 +-
.../component/quartz2/SpringQuartzConsumerClusteredAppOne.xml | 2 +-
.../component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml | 2 +-
.../camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml | 2 +-
.../camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3cdc6fd0/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
index ae837e2..08c19a8 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
@@ -60,7 +60,7 @@
<property name="routeStartTime" value="0/3 * * * * ?" />
</bean>
- <camelContext id="camelContext" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camelContext" shutdownEager="false" xmlns="http://camel.apache.org/schema/spring">
<template id="template" />
<route id="myRoute" routePolicyRef="startPolicy" autoStartup="false">
<from uri="direct:start" />
http://git-wip-us.apache.org/repos/asf/camel/blob/3cdc6fd0/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
index 51a488c..cf3f0de 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
@@ -60,7 +60,7 @@
<property name="routeStartTime" value="0/3 * * * * ?" />
</bean>
- <camelContext id="camelContext2" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camelContext2" shutdownEager="false" xmlns="http://camel.apache.org/schema/spring">
<template id="template" />
<route id="myRoute" routePolicyRef="startPolicy" autoStartup="false">
<from uri="direct:start" />
http://git-wip-us.apache.org/repos/asf/camel/blob/3cdc6fd0/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
index 3b06927..9e1207b 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
+++ b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
@@ -59,7 +59,7 @@
</property>
</bean>
- <camelContext id="camelContext" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camelContext" shutdownEager="false" xmlns="http://camel.apache.org/schema/spring">
<template id="template" />
<route id="myRoute">
<from uri="quartz2://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1" />
http://git-wip-us.apache.org/repos/asf/camel/blob/3cdc6fd0/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
index 287546c..0991786 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
+++ b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
@@ -57,7 +57,7 @@
</property>
</bean>
- <camelContext id="camelContext2" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camelContext2" shutdownEager="false" xmlns="http://camel.apache.org/schema/spring">
<template id="template" />
<route id="myRoute">
<from uri="quartz2://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1" />
http://git-wip-us.apache.org/repos/asf/camel/blob/3cdc6fd0/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
index c75f049..fa706e3 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
+++ b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
@@ -61,7 +61,7 @@
<property name="routeStartTime" value="0/3 * * * * ?" />
</bean>
- <camelContext id="camelContext" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camelContext" shutdownEager="false" xmlns="http://camel.apache.org/schema/spring">
<template id="template" />
<route id="myRoute" routePolicyRef="startPolicy" autoStartup="false">
<from uri="direct:start" />
http://git-wip-us.apache.org/repos/asf/camel/blob/3cdc6fd0/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
index ac60919..4b83202 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
+++ b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
@@ -61,7 +61,7 @@
<property name="routeStartTime" value="0/3 * * * * ?" />
</bean>
- <camelContext id="camelContext2" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camelContext2" shutdownEager="false" xmlns="http://camel.apache.org/schema/spring">
<template id="template" />
<route id="myRoute" routePolicyRef="startPolicy" autoStartup="false">
<from uri="direct:start" />