You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/04/16 16:42:02 UTC
[2/2] git commit: CAMEL-7361: Spring main should be able to detect
additional spring xml locations on the classpath without any additional
configuration.
CAMEL-7361: Spring main should be able to detect additional spring xml locations on the classpath without any additional configuration.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd2c8887
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd2c8887
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd2c8887
Branch: refs/heads/camel-2.13.x
Commit: cd2c88877c26468a6b5ed3ee0dc5684c39ea6c60
Parents: 5e13003
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 16 07:45:50 2014 -0700
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 16 07:46:03 2014 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/spring/Main.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cd2c8887/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java b/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
index 23fc233..a09e8d4 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
@@ -42,7 +42,14 @@ import org.springframework.context.support.FileSystemXmlApplicationContext;
/**
* A command line tool for booting up a CamelContext using an optional Spring
- * ApplicationContext
+ * {@link org.springframework.context.ApplicationContext}.
+ * <p/>
+ * By placing a file in the {@link #LOCATION_PROPERTIES} directory of any JARs on the classpath,
+ * allows this Main class to load those additional Spring XML files as Spring
+ * {@link org.springframework.context.ApplicationContext} to be included.
+ * <p/>
+ * Each line in the {@link #LOCATION_PROPERTIES} is a reference to a Spring XML file to include,
+ * which by default gets loaded from classpath.
*/
@SuppressWarnings("deprecation")
public class Main extends MainSupport {