From 71c7872270a8c7c65ff21f0480630ae02b9d919c Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Wed, 6 Oct 2010 11:35:18 -0700
Subject: [PATCH] INT-1495: change default domain to
 org.springframework.integration

---
 .../integration/monitor/IntegrationMBeanExporter.java         | 2 +-
 .../jmx/config/PollingAdapterMBeanTests-context.xml           | 4 ++--
 .../integration/jmx/config/PollingAdapterMBeanTests.java      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
index d98780dcea..5d0b915710 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
@@ -89,7 +89,7 @@ public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostP
 
 	private static final Log logger = LogFactory.getLog(IntegrationMBeanExporter.class);
 
-	public static final String DEFAULT_DOMAIN = "spring.application";
+	public static final String DEFAULT_DOMAIN = "org.springframework.integration";
 
 	private final AnnotationJmxAttributeSource attributeSource = new AnnotationJmxAttributeSource();
 
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml
index 49f81b6930..b9ae8c7926 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml
@@ -14,7 +14,7 @@
 
 	<context:mbean-server id="mbs" />
 	
-	<context:mbean-export server="mbs" default-domain="spring.application"/>
+	<context:mbean-export server="mbs" default-domain="test.PollingAdapterMBean"/>
 
 	<int:channel id="testChannel" />
 	
@@ -25,6 +25,6 @@
 	
 	<int:logging-channel-adapter channel="testChannel"/>
 	
-	<jmx:mbean-export id="integrationMbeanExporter" server="mbs"/>
+	<jmx:mbean-export id="integrationMbeanExporter" server="mbs" default-domain="test.PollingAdapterMBean"/>
 
 </beans>
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java
index 314a6a1088..25faf51a4d 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java
@@ -40,7 +40,7 @@ public class PollingAdapterMBeanTests {
 	@Test
 	public void testMessageSourceMBeanExists() throws Exception {
 		// System.err.println(server.queryNames(new ObjectName("*:type=MessageSource,*"), null));
-		Set<ObjectName> names = server.queryNames(new ObjectName("spring.application:type=MessageSource,*"), null);
+		Set<ObjectName> names = server.queryNames(new ObjectName("test.PollingAdapterMBean:type=MessageSource,*"), null);
 		assertEquals(1, names.size());
 	}