camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject git commit: Added 2 more seconds of sleep to make the test not fail on the CI-Server, also did two tiny polishments as well.
Date Tue, 09 Jul 2013 20:16:58 GMT
Updated Branches:
  refs/heads/camel-2.10.x a2e9ee9de -> 867f89098


Added 2 more seconds of sleep to make the test not fail on the CI-Server, also did two tiny
polishments as well.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/867f8909
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/867f8909
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/867f8909

Branch: refs/heads/camel-2.10.x
Commit: 867f8909856918a83ce30b26b8dcd3696de33cb8
Parents: a2e9ee9
Author: Babak Vahdat <bvahdat@apache.org>
Authored: Tue Jul 9 22:11:26 2013 +0200
Committer: Babak Vahdat <bvahdat@apache.org>
Committed: Tue Jul 9 22:15:56 2013 +0200

----------------------------------------------------------------------
 .../src/main/resources/META-INF/spring/camel-context.xml         | 2 +-
 .../apache/camel/example/pojo_messaging/CamelContextTest.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/867f8909/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
b/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
index f195ed9..0807162 100644
--- a/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
+++ b/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
@@ -24,7 +24,7 @@
        xsi:schemaLocation="
          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
          http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-         http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd">
+         http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
   <!-- This creates an embedded ActiveMQ Broker -->
   <broker xmlns="http://activemq.apache.org/schema/core" useJmx="true" persistent="false"

http://git-wip-us.apache.org/repos/asf/camel/blob/867f8909/examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo_messaging/CamelContextTest.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo_messaging/CamelContextTest.java
b/examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo_messaging/CamelContextTest.java
index 6537f2d..9333bb4 100644
--- a/examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo_messaging/CamelContextTest.java
+++ b/examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo_messaging/CamelContextTest.java
@@ -35,7 +35,7 @@ public class CamelContextTest extends CamelSpringTestSupport {
     @Test
     public void testCheckFiles() throws Exception {
         // wait a little for the files to be picked up and processed
-        Thread.sleep(3000);
+        Thread.sleep(5000);
 
         File file = new File("target/messages/emea/hr_pickup");
         file = file.getAbsoluteFile();
@@ -49,7 +49,7 @@ public class CamelContextTest extends CamelSpringTestSupport {
 
     @Override
     protected AbstractXmlApplicationContext createApplicationContext() {        
-        return new ClassPathXmlApplicationContext(new String[] {"/META-INF/spring/camel-context.xml"});
+        return new ClassPathXmlApplicationContext("META-INF/spring/camel-context.xml");
     }
 
 }


Mime
View raw message