camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hekon...@apache.org
Subject git commit: Improved Javadoc.
Date Sat, 02 Nov 2013 21:58:12 GMT
Updated Branches:
  refs/heads/master 4f639926e -> e6059b49a


Improved Javadoc.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e6059b49
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e6059b49
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e6059b49

Branch: refs/heads/master
Commit: e6059b49a7f514dd2ae5d6dfb36f8f63e5f60984
Parents: 4f63992
Author: Henryk Konsek <hekonsek@gmail.com>
Authored: Sat Nov 2 22:58:03 2013 +0100
Committer: Henryk Konsek <hekonsek@gmail.com>
Committed: Sat Nov 2 22:58:03 2013 +0100

----------------------------------------------------------------------
 .../apache/camel/spring/javaconfig/CamelConfiguration.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e6059b49/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 c6e5142..cf4d6e6 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
@@ -151,7 +151,13 @@ public abstract class CamelConfiguration implements BeanFactoryAware,
Applicatio
     protected void setupCamelContext(CamelContext camelContext) throws Exception {
         
     }
-    
+
+    /**
+     * Factory method returning {@link CamelContext} used by this configuration.
+     *
+     * @return {@link CamelContext} used by this configuration. By default {@link SpringCamelContext}
instance is
+     * created, to fully integrate Spring application context and Camel registry.
+     */
     protected CamelContext createCamelContext() throws Exception {
         return new SpringCamelContext(getApplicationContext());
     }


Mime
View raw message