Repository: camel Updated Branches: refs/heads/master b0289c4e9 -> 18a169c65
CAMEL-9650: camel-spring-javaconfig polished example and make it more like spring-boot Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/18a169c6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/18a169c6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/18a169c6 Branch: refs/heads/master Commit: 18a169c6534dc5730d16a564ad638572367e82d4 Parents: 03f5d3a Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Apr 9 10:45:14 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Apr 9 10:45:26 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/spring/javaconfig/RoutesCollector.java | 1 + .../test/CamelSpringDelegatingTestContextLoaderTest.java | 2 -- .../camel/test/spring/CamelSpringDelegatingTestContextLoader.java | 2 ++ .../org/apache/camel/example/spring/javaconfig/MyApplication.java | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/18a169c6/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/RoutesCollector.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/RoutesCollector.java b/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/RoutesCollector.java index 02bc123..b474cde 100644 --- a/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/RoutesCollector.java +++ b/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/RoutesCollector.java @@ -20,6 +20,7 @@ import java.lang.reflect.Modifier; import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; +import org.apache.camel.spring.SpringCamelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; http://git-wip-us.apache.org/repos/asf/camel/blob/18a169c6/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java index b3d106d..975008a 100644 --- a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java +++ b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java @@ -25,7 +25,6 @@ import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration; import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader; import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner; import org.apache.camel.test.spring.MockEndpoints; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.context.annotation.Bean; @@ -45,7 +44,6 @@ import org.springframework.test.context.ContextConfiguration; loader = CamelSpringDelegatingTestContextLoader.class ) @MockEndpoints -@Ignore public class CamelSpringDelegatingTestContextLoaderTest { @EndpointInject(uri = "mock:direct:end") protected MockEndpoint endEndpoint; http://git-wip-us.apache.org/repos/asf/camel/blob/18a169c6/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java ---------------------------------------------------------------------- diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java index 5f6c5e7..cfcc450 100644 --- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java +++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java @@ -69,8 +69,10 @@ public class CamelSpringDelegatingTestContextLoader extends DelegatingSmartConte try { SpringCamelContext.setNoStart(true); + System.setProperty("skipStartingCamelContext", "true"); ConfigurableApplicationContext context = (ConfigurableApplicationContext) super.loadContext(mergedConfig); SpringCamelContext.setNoStart(false); + System.clearProperty("skipStartingCamelContext"); return loadContext(context, testClass); } finally { cleanup(testClass); http://git-wip-us.apache.org/repos/asf/camel/blob/18a169c6/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyApplication.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyApplication.java b/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyApplication.java index fe4c7af..efa4602 100644 --- a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyApplication.java +++ b/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyApplication.java @@ -21,6 +21,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.jms.JmsComponent; import org.apache.camel.spring.javaconfig.CamelConfiguration; import org.apache.camel.spring.javaconfig.Main; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; //START SNIPPET: RouteConfig @@ -28,6 +29,7 @@ import org.springframework.context.annotation.Configuration; * A simple example router from a file system to an ActiveMQ queue and then to a file system */ @Configuration +@ComponentScan public class MyApplication extends CamelConfiguration { /** @@ -36,7 +38,6 @@ public class MyApplication extends CamelConfiguration { public static void main(String[] args) throws Exception { Main main = new Main(); main.setConfigClass(MyApplication.class); - main.setBasedPackages("org.apache.camel.example.spring.javaconfig"); main.run(); }
