Updated Branches: refs/heads/master 6eafddcf2 -> 5055f6739
Updated JavaConfig Javadoc. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5055f673 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5055f673 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5055f673 Branch: refs/heads/master Commit: 5055f6739f51c18e201ade164bb09a7d61a14632 Parents: 6eafddc Author: Henryk Konsek <hekon...@gmail.com> Authored: Fri Oct 25 21:16:36 2013 +0200 Committer: Henryk Konsek <hekon...@gmail.com> Committed: Fri Oct 25 21:16:36 2013 +0200 ---------------------------------------------------------------------- .../org/apache/camel/spring/javaconfig/CamelConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5055f673/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java b/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java index ba0ac09..c6e5142 100644 --- a/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java +++ b/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java @@ -41,7 +41,8 @@ import org.springframework.context.annotation.Configuration; * A useful base class for writing * <a * href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/beans.html#beans-annotation-config"> - * Spring annotation-based</a> configurations for working with Camel. + * Spring annotation-based</a> configurations for working with Camel. Unless {@link #routes()} method is overridden, this configuration + * automagically load all the {@link org.apache.camel.builder.RouteBuilder} instances available in the Spring context. */ @Configuration public abstract class CamelConfiguration implements BeanFactoryAware, ApplicationContextAware {