Author: ningjiang
Date: Tue Feb 21 12:47:52 2012
New Revision: 1291747
URL: http://svn.apache.org/viewvc?rev=1291747&view=rev
Log:
Merged revisions 1291727 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1291727 | ningjiang | 2012-02-21 20:10:29 +0800 (Tue, 21 Feb 2012) | 1 line
CAMEL-5010 add comments on the CamelNamespaceHandler
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 21 12:47:52 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=1291747&r1=1291746&r2=1291747&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Tue Feb 21 12:47:52 2012
@@ -125,6 +125,8 @@ public class CamelNamespaceHandler exten
// camel context
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.
try {
// Try to load the BundleActivator first
Class.forName("org.osgi.framework.BundleActivator");
