svn commit: r1308554 - in /camel/branches/camel-2.9.x: ./ components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java

[hadrian]

Author: hadrian
Date: Mon Apr  2 20:54:10 2012
New Revision: 1308554

URL: http://svn.apache.org/viewvc?rev=1308554&view=rev
Log:
Merged revisions 1306323 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1306323 | davsclaus | 2012-03-28 09:44:36 -0400 (Wed, 28 Mar 2012) | 1 line
  
  CAMEL-5128: Using custom NodeIdFactory is auto discovered with XML DSLs.
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1308554&r1=1308553&r2=1308554&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
 Mon Apr  2 20:54:10 2012
@@ -74,6 +74,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;
@@ -184,6 +185,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());