camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject git commit: CAMEL-6782: Polished.
Date Tue, 24 Sep 2013 23:43:24 GMT
Updated Branches:
  refs/heads/master dcc7b94c9 -> bf7a5bc35


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/bf7a5bc3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf7a5bc3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf7a5bc3

Branch: refs/heads/master
Commit: bf7a5bc352b157223cc4927e53394c0ef23c4f15
Parents: dcc7b94
Author: Babak Vahdat <bvahdat@apache.org>
Authored: Wed Sep 25 01:43:15 2013 +0200
Committer: Babak Vahdat <bvahdat@apache.org>
Committed: Wed Sep 25 01:43:15 2013 +0200

----------------------------------------------------------------------
 .../quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java         | 2 +-
 .../camel/routepolicy/quartz2/SpringQuartzClusteredAppOneTest.xml | 2 +-
 .../camel/routepolicy/quartz2/SpringQuartzClusteredAppTwoTest.xml | 2 +-
 .../camel/routepolicy/quartz2/SpringQuartzEmbeddedDatabase.xml    | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bf7a5bc3/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
index bfc3f13..55ae1a8 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
+++ b/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/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/bf7a5bc3/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOneTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOneTest.xml
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOneTest.xml
index a226946..1a3c4fd 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOneTest.xml
+++ b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/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/bf7a5bc3/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwoTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwoTest.xml
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwoTest.xml
index 21cddd9..0daa3d1 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwoTest.xml
+++ b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/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/bf7a5bc3/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzEmbeddedDatabase.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzEmbeddedDatabase.xml
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzEmbeddedDatabase.xml
index 83ae9c6..ebcd7c2 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzEmbeddedDatabase.xml
+++ b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/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">


Mime
View raw message