INT-1489: inspect router to see if it is Advised

- Switch to proxy approach for handler monitor
- Add router mbean integration test

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

@@ -40,7 +40,7 @@ public class MBeanExporterParserTests {
 	private ApplicationContext context;
 
 	@Test
-	public void test() throws InterruptedException {
+	public void testMBeanExporterExists() throws InterruptedException {
 		IntegrationMBeanExporter exporter = this.context.getBean(IntegrationMBeanExporter.class);
 		MBeanServer server = this.context.getBean("mbs", MBeanServer.class);
 		assertEquals(server, exporter.getServer());

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

@@ -0,0 +1,30 @@
+<?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:int="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" />
+
+	<int:channel id="testChannel" />
+	<int:channel id="intChannel" />
+	<int:channel id="stringChannel" />
+	
+	<int:payload-type-router id="ptRouter"
+		input-channel="testChannel">
+		<int:mapping type="java.lang.String" channel="stringChannel" />
+		<int:mapping type="java.lang.Integer" channel="intChannel" />
+	</int:payload-type-router>
+
+	<jmx:mbean-exporter id="mbeanExporter" mbean-server="mbs"
+		domain="tests.MBeanExpoerterParser" />
+
+</beans>

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

@@ -0,0 +1,47 @@
+/*
+ * 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.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.monitor.IntegrationMBeanExporter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Dave Syer
+ * @since 2.0
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class RouterMBeanTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+	@Test
+	public void testMBeanExporterExists() throws InterruptedException {
+		IntegrationMBeanExporter exporter = this.context.getBean(IntegrationMBeanExporter.class);
+		MBeanServer server = this.context.getBean("mbs", MBeanServer.class);
+		assertEquals(server, exporter.getServer());
+		exporter.destroy();
+	}
+
+}