Updated Branches:
  refs/heads/master 39db818c9 -> b34afbe24

CAMEL-6938: Removed the obsolete setup of the host name as we now don't depend 
on it being "localhost" anymore, and the default JMX domain name is 
"org.apache.camel" anyway.

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b34afbe2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b34afbe2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b34afbe2

Branch: refs/heads/master
Commit: b34afbe24efdb6f3607b1424699d6fca43a0851c
Parents: 39db818
Author: Babak Vahdat <[email protected]>
Authored: Wed Nov 6 14:06:52 2013 +0100
Committer: Babak Vahdat <[email protected]>
Committed: Wed Nov 6 14:06:52 2013 +0100

----------------------------------------------------------------------
 .../camel/management/JmxInstrumentationCustomMBeanTest.java     | 3 ---
 .../camel/management/JmxNotificationEventNotifierTest.java      | 4 ----
 .../apache/camel/management/ManagedDualCamelContextTest.java    | 3 ---
 .../java/org/apache/camel/management/ManagementTestSupport.java | 3 ---
 .../TwoManagedCamelContextAutoAssignedNameClashTest.java        | 3 ---
 .../camel/management/TwoManagedCamelContextClashTest.java       | 3 ---
 .../org/apache/camel/management/TwoManagedCamelContextTest.java | 3 ---
 .../org/apache/camel/management/TwoManagedNamePatternTest.java  | 3 ---
 .../camel/component/jms/JmsAddAndRemoveRouteManagementTest.java | 5 -----
 .../org/apache/camel/component/jms/ManagedJmsEndpointTest.java  | 4 ----
 .../apache/camel/component/jms/ManagedJmsEndpointTopicTest.java | 4 ----
 .../jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml        | 5 -----
 .../camel/component/netty/http/ManagedNettyEndpointTest.java    | 4 ----
 .../test/resources/org/apache/camel/spring/defaultJmxConfig.xml | 5 -----
 .../src/test/resources/org/apache/camel/spring/jmxConfig.xml    | 5 -----
 .../org/apache/camel/spring/jmxConfigUsingProperties.xml        | 5 -----
 .../camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml     | 5 -----
 .../spring/management/SpringJmxEndpointInjectBeanRefTest.xml    | 5 -----
 .../spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml | 5 -----
 .../camel/spring/management/SpringJmxEndpointInjectBeanTest.xml | 5 -----
 .../camel/spring/management/SpringJmxRecipientListTest.xml      | 5 -----
 .../management/SpringJmxRecipientListTestRegisterAlways.xml     | 5 -----
 .../spring/management/SpringManagedCustomProcessorTest.xml      | 5 -----
 .../spring/management/SpringManagedNamePatternFixedTest.xml     | 5 -----
 .../camel/spring/management/SpringManagedNamePatternTest.xml    | 5 -----
 .../camel/spring/management/SpringManagedResourceTest.xml       | 5 -----
 .../SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml   | 5 -----
 ...gManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml | 5 -----
 .../SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml     | 5 -----
 .../camel/spring/management/SpringManagedSanitizeTest.xml       | 5 -----
 .../camel/spring/management/SpringManagedSedaEndpointTest.xml   | 5 -----
 .../spring/processor/SpringDualManagedThreadsThreadPoolTest.xml | 5 -----
 .../spring/processor/SpringManagedThreadsThreadPoolTest.xml     | 5 -----
 .../test/blueprint/management/managedNamePatternFixedTest.xml   | 5 -----
 .../camel/component/zookeeper/ZooKeeperManagedEndpointTest.java | 4 ----
 .../org/apache/camel/itest/osgi/blueprint/blueprint-fixed.xml   | 5 -----
 36 files changed, 161 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
index 48a1b8b..1ede3a8 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
@@ -43,9 +43,6 @@ public class JmxInstrumentationCustomMBeanTest extends 
JmxInstrumentationUsingDe
 
         context.addComponent("custom", new CustomComponent());
 
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
         return context;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/camel-core/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
index 96dfc50..6392c10 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
@@ -51,10 +51,6 @@ public class JmxNotificationEventNotifierTest extends 
ContextTestSupport {
         CamelContext context = new DefaultCamelContext(createRegistry());
         context.getManagementStrategy().addEventNotifier(notifier);
 
-        // Set up the ManagementNamingStrategy
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
         // END SNIPPET: e1
         return context;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/camel-core/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
index 29c16a6..cc4c3a6 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
@@ -33,9 +33,6 @@ public class ManagedDualCamelContextTest extends TestSupport {
 
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = new DefaultCamelContext();
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
         context.addRoutes(createRouteBuilder());
         return context;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
 
b/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
index 6d3f351..8680fa7 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
@@ -36,9 +36,6 @@ public abstract class ManagementTestSupport extends 
ContextTestSupport {
 
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = new DefaultCamelContext();
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
         return context;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextAutoAssignedNameClashTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextAutoAssignedNameClashTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextAutoAssignedNameClashTest.java
index 80d2304..e4ba081 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextAutoAssignedNameClashTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextAutoAssignedNameClashTest.java
@@ -34,9 +34,6 @@ public class TwoManagedCamelContextAutoAssignedNameClashTest 
extends TestSupport
 
     protected CamelContext createCamelContext() throws Exception {
         DefaultCamelContext context = new DefaultCamelContext();
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
         return context;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextClashTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextClashTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextClashTest.java
index 3d88b05..dfefeb2 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextClashTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextClashTest.java
@@ -38,9 +38,6 @@ public class TwoManagedCamelContextClashTest extends 
TestSupport {
         if (managementPattern != null) {
             
context.getManagementNameStrategy().setNamePattern(managementPattern);
         }
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
         return context;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextTest.java
index f22acb0..7a31c30 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/TwoManagedCamelContextTest.java
@@ -34,9 +34,6 @@ public class TwoManagedCamelContextTest extends TestSupport {
     protected CamelContext createCamelContext(String name) throws Exception {
         DefaultCamelContext context = new DefaultCamelContext();
         context.setName(name);
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
         return context;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/camel-core/src/test/java/org/apache/camel/management/TwoManagedNamePatternTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/TwoManagedNamePatternTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/TwoManagedNamePatternTest.java
index dccb29f..a1b84ea 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/TwoManagedNamePatternTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/TwoManagedNamePatternTest.java
@@ -35,9 +35,6 @@ public class TwoManagedNamePatternTest extends TestSupport {
         DefaultCamelContext context = new DefaultCamelContext();
         context.setName(name);
         context.getManagementNameStrategy().setNamePattern(pattern);
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
         return context;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAddAndRemoveRouteManagementTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAddAndRemoveRouteManagementTest.java
 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAddAndRemoveRouteManagementTest.java
index eb35bea..cf5e363 100644
--- 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAddAndRemoveRouteManagementTest.java
+++ 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAddAndRemoveRouteManagementTest.java
@@ -23,7 +23,6 @@ import javax.management.ObjectName;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.management.DefaultManagementNamingStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -79,10 +78,6 @@ public class JmsAddAndRemoveRouteManagementTest extends 
CamelTestSupport {
         ConnectionFactory connectionFactory = 
CamelJmsTestHelper.createConnectionFactory();
         camelContext.addComponent("activemq", 
jmsComponentAutoAcknowledge(connectionFactory));
 
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
camelContext.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
-
         return camelContext;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
index d8e7744..34ab04f 100644
--- 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
+++ 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
@@ -23,7 +23,6 @@ import javax.management.ObjectName;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.management.DefaultManagementNamingStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -41,9 +40,6 @@ public class ManagedJmsEndpointTest extends CamelTestSupport {
 
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = new DefaultCamelContext();
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
 
         ConnectionFactory connectionFactory = 
CamelJmsTestHelper.createConnectionFactory();
         context.addComponent("activemq", 
jmsComponentAutoAcknowledge(connectionFactory));

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
index 9d05db5..c51a9bd 100644
--- 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
+++ 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
@@ -23,7 +23,6 @@ import javax.management.ObjectName;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.management.DefaultManagementNamingStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -41,9 +40,6 @@ public class ManagedJmsEndpointTopicTest extends 
CamelTestSupport {
 
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = new DefaultCamelContext();
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
 
         ConnectionFactory connectionFactory = 
CamelJmsTestHelper.createConnectionFactory();
         context.addComponent("activemq", 
jmsComponentAutoAcknowledge(connectionFactory));

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
 
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
index 01ae6b0..bdde043 100644
--- 
a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
+++ 
b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionIsTransactedRedeliveredTest.xml
@@ -44,11 +44,6 @@
         <property name="errorHandlerLogStackTrace" value="false"/>
     </bean>
 
-    <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-        <property name="hostName" value="localhost"/>
-        <property name="domainName" value="org.apache.camel"/>
-    </bean>
-
     <camelContext xmlns="http://camel.apache.org/schema/spring";>
       
       <!-- enable JMX -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ManagedNettyEndpointTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ManagedNettyEndpointTest.java
 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ManagedNettyEndpointTest.java
index 3645192..2dc5454 100644
--- 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ManagedNettyEndpointTest.java
+++ 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ManagedNettyEndpointTest.java
@@ -23,7 +23,6 @@ import javax.management.ObjectName;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.management.DefaultManagementNamingStrategy;
 import org.junit.Test;
 
 public class ManagedNettyEndpointTest extends BaseNettyTest {
@@ -35,9 +34,6 @@ public class ManagedNettyEndpointTest extends BaseNettyTest {
 
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = super.createCamelContext();
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
         return context;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/defaultJmxConfig.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/defaultJmxConfig.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/defaultJmxConfig.xml
index 9e9b0ff..38e8771 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/defaultJmxConfig.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/defaultJmxConfig.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-        <property name="hostName" value="localhost"/>
-        <property name="domainName" value="org.apache.camel"/>
-    </bean>
-
     <!-- START SNIPPET: example -->
     <camelContext xmlns="http://camel.apache.org/schema/spring";>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfig.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfig.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfig.xml
index f310198..00cdd52 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfig.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfig.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-        <property name="hostName" value="localhost"/>
-        <property name="domainName" value="org.apache.camel"/>
-    </bean>
-
     <!-- START SNIPPET: example -->
     <camelContext xmlns="http://camel.apache.org/schema/spring";>
         <!-- enable JMX -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
index 7700e0a..5b80817 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-        <property name="hostName" value="localhost"/>
-        <property name="domainName" value="org.apache.camel"/>
-    </bean>
-
     <!-- START SNIPPET: e1 -->
     <camelContext xmlns="http://camel.apache.org/schema/spring";>
         <propertyPlaceholder id="properties" 
location="org/apache/camel/spring/jmx.properties"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml
index 4e39c85..8b06319 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-        <property name="hostName" value="localhost"/>
-        <property name="domainName" value="org.apache.camel"/>
-    </bean>
-
     <camelContext xmlns="http://camel.apache.org/schema/spring";>
         <!-- enable JMX -->
         <jmxAgent id="agent" disabled="false"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.xml
index 654c915..da51908 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-      <property name="hostName" value="localhost"/>
-      <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <camelContext xmlns="http://camel.apache.org/schema/spring";>
 
     <!-- enable JMX -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml
index 6ce38fd..7347309 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-      <property name="hostName" value="localhost"/>
-      <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <camelContext xmlns="http://camel.apache.org/schema/spring";>
 
     <!-- enable JMX -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.xml
index 514d7a9..84996e9 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-      <property name="hostName" value="localhost"/>
-      <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <camelContext xmlns="http://camel.apache.org/schema/spring";>
 
     <!-- enable JMX -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTest.xml
index b047ca9..adbd4c5 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-        <property name="hostName" value="localhost"/>
-        <property name="domainName" value="org.apache.camel"/>
-    </bean>
-
     <!-- START SNIPPET: e1 -->
     <camelContext xmlns="http://camel.apache.org/schema/spring";>
         <!-- enable JMX -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTestRegisterAlways.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTestRegisterAlways.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTestRegisterAlways.xml
index 010ccf4..5cd89d2 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTestRegisterAlways.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringJmxRecipientListTestRegisterAlways.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-        <property name="hostName" value="localhost"/>
-        <property name="domainName" value="org.apache.camel"/>
-    </bean>
-
     <!-- START SNIPPET: e1 -->
     <camelContext xmlns="http://camel.apache.org/schema/spring";>
         <!-- enable JMX, and always register mbeans -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.xml
index fb9d110..3126c6f 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.xml
@@ -24,11 +24,6 @@
 
   <bean id="myProcessor" 
class="org.apache.camel.spring.management.SpringManagedCustomProcessorTest$MyCustomProcessor"/>
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <camelContext xmlns="http://camel.apache.org/schema/spring";>
     <!-- enable JMX -->
     <jmxAgent id="agent" disabled="false"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml
index 41a2fd9..5305aba 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <!-- START SNIPPET: example -->
   <camelContext managementNamePattern="cool" 
xmlns="http://camel.apache.org/schema/spring";>
     <jmxAgent id="agent"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternTest.xml
index 494c039..ea98c9d 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedNamePatternTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <!-- START SNIPPET: example -->
   <camelContext managementNamePattern="cool-#name#" 
xmlns="http://camel.apache.org/schema/spring";>
     <jmxAgent id="agent"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedResourceTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedResourceTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedResourceTest.xml
index 3b4ca52..08dd51e 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedResourceTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedResourceTest.xml
@@ -23,11 +23,6 @@
          http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
        ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <bean id="myBean" class="org.apache.camel.management.MyManagedBean"/>
 
   <camelContext xmlns="http://camel.apache.org/schema/spring";>

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml
index 2920f6f..984b509 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <camelContext errorHandlerRef="dead" 
xmlns="http://camel.apache.org/schema/spring";>
     <jmxAgent id="agent"/>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml
index eae45b1..879ae87 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <camelContext errorHandlerRef="logger" 
xmlns="http://camel.apache.org/schema/spring";>
     <jmxAgent id="agent"/>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml
index bae9716..5c38dfc 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <camelContext xmlns="http://camel.apache.org/schema/spring";>
     <jmxAgent id="agent"/>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSanitizeTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSanitizeTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSanitizeTest.xml
index 940e244..1f7beb0 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSanitizeTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSanitizeTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <!-- START SNIPPET: example -->
   <camelContext xmlns="http://camel.apache.org/schema/spring";>
     <!-- mask JMX so sensitive information such as passwords is not shown -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.xml
index 88b2fb8..787185f 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <camelContext xmlns="http://camel.apache.org/schema/spring";>
     <jmxAgent id="agent"/>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDualManagedThreadsThreadPoolTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDualManagedThreadsThreadPoolTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDualManagedThreadsThreadPoolTest.xml
index 29f17da..d27aa67 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDualManagedThreadsThreadPoolTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDualManagedThreadsThreadPoolTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-        <property name="hostName" value="localhost"/>
-        <property name="domainName" value="org.apache.camel"/>
-    </bean>
-
     <camelContext xmlns="http://camel.apache.org/schema/spring";>
 
         <!-- enable JMX -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.xml
 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.xml
index 3394e35..337573f 100644
--- 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.xml
+++ 
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.xml
@@ -22,11 +22,6 @@
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-    <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-        <property name="hostName" value="localhost"/>
-        <property name="domainName" value="org.apache.camel"/>
-    </bean>
-
     <camelContext xmlns="http://camel.apache.org/schema/spring";>
 
         <!-- enable JMX -->

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/management/managedNamePatternFixedTest.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/management/managedNamePatternFixedTest.xml
 
b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/management/managedNamePatternFixedTest.xml
index 9f7335d..00e1baa 100644
--- 
a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/management/managedNamePatternFixedTest.xml
+++ 
b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/management/managedNamePatternFixedTest.xml
@@ -20,11 +20,6 @@
            xsi:schemaLocation="
              http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd";>
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <!-- START SNIPPET: example -->
   <camelContext id="cool" managementNamePattern="#name#-#version#" 
xmlns="http://camel.apache.org/schema/blueprint";>
     <jmxAgent id="agent"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
 
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
index 65b75ba..ae67866 100644
--- 
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
+++ 
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
@@ -25,7 +25,6 @@ import javax.management.ObjectName;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.management.DefaultManagementNamingStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 import org.springframework.jmx.support.JmxUtils;
@@ -52,9 +51,6 @@ public class ZooKeeperManagedEndpointTest extends 
CamelTestSupport {
 
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = new DefaultCamelContext();
-        DefaultManagementNamingStrategy naming = 
(DefaultManagementNamingStrategy) 
context.getManagementStrategy().getManagementNamingStrategy();
-        naming.setHostName("localhost");
-        naming.setDomainName("org.apache.camel");
         return context;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b34afbe2/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-fixed.xml
----------------------------------------------------------------------
diff --git 
a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-fixed.xml
 
b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-fixed.xml
index 372acbd..2818bf6 100644
--- 
a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-fixed.xml
+++ 
b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-fixed.xml
@@ -17,11 +17,6 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";>
 
-  <bean id="naming" 
class="org.apache.camel.management.DefaultManagementNamingStrategy">
-    <property name="hostName" value="localhost"/>
-    <property name="domainName" value="org.apache.camel"/>
-  </bean>
-
   <!-- START SNIPPET: example -->
   <camelContext managementNamePattern="cool" 
xmlns="http://camel.apache.org/schema/blueprint";>
     <jmxAgent id="agent"/>

Reply via email to