Repository: camel Updated Branches: refs/heads/master 25103bf65 -> b05da3804
Deprecated api on SpringCamelContext as they are not the way to use Camel and Spring together. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b05da380 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b05da380 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b05da380 Branch: refs/heads/master Commit: b05da3804f1849fabb7fb975d6c0673aed02f5a5 Parents: 25103bf Author: Claus Ibsen <[email protected]> Authored: Mon Sep 7 12:05:54 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Mon Sep 7 12:05:54 2015 +0200 ---------------------------------------------------------------------- .../apache/camel/spring/SpringCamelContext.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b05da380/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java index bc6eb91..62b988f 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java @@ -78,11 +78,21 @@ public class SpringCamelContext extends DefaultCamelContext implements Initializ NO_START.remove(); } } - + + /** + * @deprecated its better to create and boot Spring the standard Spring way and to get hold of CamelContext + * using the Spring API. + */ + @Deprecated public static SpringCamelContext springCamelContext(ApplicationContext applicationContext) throws Exception { return springCamelContext(applicationContext, true); } - + + /** + * @deprecated its better to create and boot Spring the standard Spring way and to get hold of CamelContext + * using the Spring API. + */ + @Deprecated public static SpringCamelContext springCamelContext(ApplicationContext applicationContext, boolean maybeStart) throws Exception { if (applicationContext != null) { // lets try and look up a configured camel context in the context @@ -99,6 +109,11 @@ public class SpringCamelContext extends DefaultCamelContext implements Initializ return answer; } + /** + * @deprecated its better to create and boot Spring the standard Spring way and to get hold of CamelContext + * using the Spring API. + */ + @Deprecated public static SpringCamelContext springCamelContext(String configLocations) throws Exception { return springCamelContext(new ClassPathXmlApplicationContext(configLocations)); }
