svn commit: r1306323 - /camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java

[davsclaus]

Author: davsclaus
Date: Wed Mar 28 13:44:36 2012
New Revision: 1306323

URL: http://svn.apache.org/viewvc?rev=1306323&view=rev
Log:
CAMEL-5128: Using custom NodeIdFactory is auto discovered with XML DSLs.

Modified:
    
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java

Modified: 
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1306323&r1=1306322&r2=1306323&view=diff
==============================================================================
--- 
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
 (original)
+++ 
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
 Wed Mar 28 13:44:36 2012
@@ -73,6 +73,7 @@ import org.apache.camel.spi.InterceptStr
 import org.apache.camel.spi.LifecycleStrategy;
 import org.apache.camel.spi.ManagementNamingStrategy;
 import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.spi.NodeIdFactory;
 import org.apache.camel.spi.PackageScanClassResolver;
 import org.apache.camel.spi.PackageScanFilter;
 import org.apache.camel.spi.ProcessorFactory;
@@ -181,6 +182,11 @@ public abstract class AbstractCamelConte
             LOG.info("Using custom UuidGenerator: " + uuidGenerator);
             getContext().setUuidGenerator(uuidGenerator);
         }
+        NodeIdFactory nodeIdFactory = getBeanForType(NodeIdFactory.class);
+        if (nodeIdFactory != null) {
+            LOG.info("Using custom NodeIdFactory: " + nodeIdFactory);
+            getContext().setNodeIdFactory(nodeIdFactory);
+        }
 
         // set the custom registry if defined
         initCustomRegistry(getContext());