You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/09/25 01:37:54 UTC
git commit: CAMEL-6782: Polished.
Updated Branches:
refs/heads/master f9fb2c321 -> dcc7b94c9
CAMEL-6782: Polished.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dcc7b94c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dcc7b94c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dcc7b94c
Branch: refs/heads/master
Commit: dcc7b94c913381f5b54b1256d5e7023cbfd72b82
Parents: f9fb2c3
Author: Babak Vahdat <bv...@apache.org>
Authored: Wed Sep 25 01:37:39 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Wed Sep 25 01:37:39 2013 +0200
----------------------------------------------------------------------
.../quartz/SpringQuartzTwoAppsClusteredFailoverTest.java | 2 +-
.../camel/routepolicy/quartz/SpringQuartzClusteredAppOneTest.xml | 2 +-
.../camel/routepolicy/quartz/SpringQuartzClusteredAppTwoTest.xml | 2 +-
.../camel/routepolicy/quartz/SpringQuartzEmbeddedDatabase.xml | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dcc7b94c/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java
index 84b67f6..2c0be7e 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringQuartzTwoAppsClusteredFailoverTest.java
@@ -87,7 +87,7 @@ public class SpringQuartzTwoAppsClusteredFailoverTest extends TestSupport {
// stop the second app as we're already done
app2.close();
- // and as the last step stop the database itself...
+ // and as the last step shutdown the database...
db.close();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/dcc7b94c/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOneTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOneTest.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOneTest.xml
index 75f7c05..2936366 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOneTest.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOneTest.xml
@@ -60,7 +60,7 @@
<property name="routeStartTime" value="0/3 * * * * ?" />
</bean>
- <camelContext id="camelContext" managementNamePattern="#name#" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camelContext" 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/dcc7b94c/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwoTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwoTest.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwoTest.xml
index 6126464..ef1993a 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwoTest.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwoTest.xml
@@ -60,7 +60,7 @@
<property name="routeStartTime" value="0/3 * * * * ?" />
</bean>
- <camelContext id="camelContext2" managementNamePattern="#name#" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camelContext2" 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/dcc7b94c/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzEmbeddedDatabase.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzEmbeddedDatabase.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzEmbeddedDatabase.xml
index 83ae9c6..ebcd7c2 100644
--- a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzEmbeddedDatabase.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzEmbeddedDatabase.xml
@@ -20,8 +20,7 @@
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
<!-- the embedded persistent storage for quartz -->
<jdbc:embedded-database id="quartz-db" type="DERBY">