INT-1418: add control-bus

spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests-context.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:si="http://www.springframework.org/schema/integration"
+	xmlns:jmx="http://www.springframework.org/schema/integration/jmx"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/context
+			http://www.springframework.org/schema/context/spring-context.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd
+			http://www.springframework.org/schema/integration/jmx
+			http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd">
+
+	<context:mbean-server id="mbs"/>
+
+	<si:channel id="testChannel"/>
+
+	<jmx:control-bus mbean-exporter="mbeanExporter" operation-channel="testChannel"/>
+
+	<jmx:mbean-exporter id="mbeanExporter" mbean-server="mbs" domain="tests.ControlBusParser"/>
+
+</beans>

spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.jmx.config;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.management.MBeanServer;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.DirectFieldAccessor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.control.ControlBus;
+import org.springframework.jmx.export.MBeanExporter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ * @since 2.0
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class ControlBusParserTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+	@Test
+	public void test() throws InterruptedException {
+		ControlBus controlBus = this.context.getBean(ControlBus.class);
+		assertEquals(controlBus.getOperationChannel(), this.context.getBean("testChannel"));
+		MBeanServer server = this.context.getBean("mbs", MBeanServer.class);
+		MBeanExporter exporter = (MBeanExporter) new DirectFieldAccessor(controlBus).getPropertyValue("exporter");
+		assertEquals(server, exporter.getServer());
+		exporter.destroy();
+	}
+
+}

spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests-context.xml

@@ -17,6 +17,6 @@
 
 	<si:channel id="testChannel"/>
 
-	<jmx:mbean-exporter id="controlBus" mbean-server="mbs" operation-channel="testChannel" domain="tests.ControlBusParser"/>
+	<jmx:mbean-exporter id="mbeanExporter" mbean-server="mbs" domain="tests.MBeanExpoerterParser"/>
 
 </beans>

spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java

@@ -22,11 +22,9 @@ import javax.management.MBeanServer;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.integration.control.ControlBus;
-import org.springframework.jmx.export.MBeanExporter;
+import org.springframework.integration.monitor.IntegrationMBeanExporter;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -43,10 +41,8 @@ public class MBeanExporterParserTests {
 
 	@Test
 	public void test() throws InterruptedException {
-		ControlBus controlBus = this.context.getBean(ControlBus.class);
-		assertEquals(controlBus.getOperationChannel(), this.context.getBean("testChannel"));
+		IntegrationMBeanExporter exporter = this.context.getBean(IntegrationMBeanExporter.class);
 		MBeanServer server = this.context.getBean("mbs", MBeanServer.class);
-		MBeanExporter exporter = (MBeanExporter) new DirectFieldAccessor(controlBus).getPropertyValue("exporter");
 		assertEquals(server, exporter.getServer());
 		exporter.destroy();
 	}