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 2013/09/03 12:22:21 UTC
[2/4] git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20f06460
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20f06460
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20f06460
Branch: refs/heads/camel-2.12.x
Commit: 20f06460ab0dc550d2278667f20d8806d922eb60
Parents: 61e4948
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 3 11:15:18 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 3 12:21:50 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/20f06460/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) {