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/07/09 22:11:32 UTC
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.
Updated Branches:
refs/heads/master beb9a76e3 -> 7aa163cf4
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/7aa163cf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7aa163cf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7aa163cf
Branch: refs/heads/master
Commit: 7aa163cf41101559b72935ed9be11c5605a0ac53
Parents: beb9a76
Author: Babak Vahdat <bv...@apache.org>
Authored: Tue Jul 9 22:11:26 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Tue Jul 9 22:11:26 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/7aa163cf/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/7aa163cf/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");
}
}