Updated Branches: refs/heads/master b99fd1e44 -> 34dd3962a
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f54cb233 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f54cb233 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f54cb233 Branch: refs/heads/master Commit: f54cb23394ecd70f751c8af166cc5b44bb0fbde9 Parents: b99fd1e Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Sep 3 11:15:18 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Sep 3 11:15:18 2013 +0200 ---------------------------------------------------------------------- .../org/apache/camel/spring/handler/CamelNamespaceHandler.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f54cb233/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java index 837c365..5c25414 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java @@ -66,7 +66,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; import org.springframework.beans.factory.xml.ParserContext; - /** * Camel namespace for the spring XML configuration file. */ @@ -128,7 +127,7 @@ public class CamelNamespaceHandler extends NamespaceHandlerSupport { boolean osgi = false; Class<?> cl = CamelContextFactoryBean.class; // These code will try to detected if we are in the OSGi environment. - // If so, camel will use the OSGi version of CamelContenxtFactoryBean to create the camel context. + // If so, camel will use the OSGi version of CamelContextFactoryBean to create the CamelContext. try { // Try to load the BundleActivator first Class.forName("org.osgi.framework.BundleActivator"); @@ -140,7 +139,7 @@ public class CamelNamespaceHandler extends NamespaceHandlerSupport { osgi = true; } } catch (Throwable t) { - // not running with camel-osgi so we fallback to the regular factory bean + // not running with camel-core-osgi so we fallback to the regular factory bean LOG.trace("Cannot find class so assuming not running in OSGi container: " + t.getMessage()); } if (osgi) {
