svn commit: r1142723 - /camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java

[gnodet]

Author: gnodet
Date: Mon Jul  4 16:15:37 2011
New Revision: 1142723

URL: http://svn.apache.org/viewvc?rev=1142723&view=rev
Log:
[CAMEL-4174] The camel-blueprint namespace handler does not register blueprint 
dependencies correctly

Modified:
    
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java

Modified: 
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java?rev=1142723&r1=1142722&r2=1142723&view=diff
==============================================================================
--- 
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
 (original)
+++ 
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
 Mon Jul  4 16:15:37 2011
@@ -191,6 +191,7 @@ public class CamelNamespaceHandler imple
         factory2.setDestroyMethod("destroy");
         factory2.addProperty("blueprintContainer", createRef(context, 
"blueprintContainer"));
         factory2.addProperty("bundleContext", createRef(context, 
"blueprintBundleContext"));
+        
context.getComponentDefinitionRegistry().registerComponentDefinition(factory2);
 
         MutableBeanMetadata ctx = 
context.createMetadata(MutableBeanMetadata.class);
         ctx.setId(contextId);
@@ -614,7 +615,8 @@ public class CamelNamespaceHandler imple
         }
 
         public void process(ComponentDefinitionRegistry 
componentDefinitionRegistry) {
-            CamelContext camelContext = (CamelContext) 
blueprintContainer.getComponentInstance(camelContextName);
+            CamelContextFactoryBean ccfb = (CamelContextFactoryBean) 
blueprintContainer.getComponentInstance(".camelBlueprint.factory." + 
camelContextName);
+            CamelContext camelContext = ccfb.getContext();
 
             Set<String> components = new HashSet<String>();
             Set<String> languages = new HashSet<String>();