Updated Branches: refs/heads/camel-2.11.x 4590ea3ec -> e30571690
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/e3057169 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3057169 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3057169 Branch: refs/heads/camel-2.11.x Commit: e3057169061ee04967109f7428273c452500f505 Parents: 4590ea3 Author: Babak Vahdat <bvah...@apache.org> Authored: Tue Jul 9 22:11:26 2013 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Tue Jul 9 22:13:45 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/e3057169/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/e3057169/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 5772145..2718d9d 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"); assertTrue("The pickup folder should exists", file.exists()); @@ -47,7 +47,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"); } }
