diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/control/MessageChannelInfo.java b/spring-integration-jmx/src/main/java/org/springframework/integration/control/MessageChannelInfo.java
deleted file mode 100644
index 647ed6f771..0000000000
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/control/MessageChannelInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.control;
-
-/**
- * This interface defines the MBean attributes and operations
- * to be exposed for any MessageChannel instance.
- *
- * @author Mark Fisher
- * @since 2.0
- */
-interface MessageChannelInfo {
-
- /**
- * Returns the name of the channel.
- */
- String getName();
-
- /**
- * Number of Messages that have been sent successfully.
- */
- long getSendSuccessCount();
-
- /**
- * Number of Messages that have caused Exceptions on send.
- */
- long getSendErrorCount();
-
-}
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/control/PollableChannelInfo.java b/spring-integration-jmx/src/main/java/org/springframework/integration/control/PollableChannelInfo.java
deleted file mode 100644
index fb6c6abddc..0000000000
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/control/PollableChannelInfo.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.control;
-
-/**
- * This interface defines the MBean attributes and operations
- * to be exposed for any PollableChannel instance.
- *
- * @author Mark Fisher
- * @since 2.0
- */
-interface PollableChannelInfo extends MessageChannelInfo {
-
- /**
- * Clears all Messages currently held by the channel.
- */
- void clear();
-
-}
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/control/QueueChannelInfo.java b/spring-integration-jmx/src/main/java/org/springframework/integration/control/QueueChannelInfo.java
deleted file mode 100644
index ea70117afb..0000000000
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/control/QueueChannelInfo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.control;
-
-/**
- * This interface defines the MBean attributes and operations
- * to be exposed for any QueueChannel instance.
- *
- * @author Mark Fisher
- * @since 2.0
- */
-interface QueueChannelInfo extends PollableChannelInfo {
-
- /**
- * Returns the number of Messages contained within the queue at the time of invocation.
- */
- int getQueueSize();
-
- /**
- * Returns the remaining capacity of the queue at the time of invocation.
- */
- int getRemainingCapacity();
-
-}
diff --git a/spring-integration-jmx/src/test/java/log4j.properties b/spring-integration-jmx/src/test/java/log4j.properties
index 364ed2ec18..f3be4a6292 100644
--- a/spring-integration-jmx/src/test/java/log4j.properties
+++ b/spring-integration-jmx/src/test/java/log4j.properties
@@ -6,5 +6,5 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m
log4j.category.org.springframework=WARN
-log4j.category.org.springframework.integration=DEBUG
-log4j.category.org.springframework.integration.monitor=TRACE
+#log4j.category.org.springframework.integration=DEBUG
+#log4j.category.org.springframework.integration.monitor=TRACE
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/IgnoredTestSuite.java b/spring-integration-jmx/src/test/java/org/springframework/integration/IgnoredTestSuite.java
index 19164f9608..da4bbfc948 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/IgnoredTestSuite.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/IgnoredTestSuite.java
@@ -1,10 +1,19 @@
package org.springframework.integration;
-import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
+import org.springframework.integration.control.ControlBusTests;
import org.springframework.integration.control.ControlBusXmlTests;
+import org.springframework.integration.jmx.AttributePollingMessageSourceTests;
+import org.springframework.integration.jmx.NotificationListeningMessageProducerTests;
+import org.springframework.integration.jmx.OperationInvokingMessageHandlerTests;
+import org.springframework.integration.jmx.config.NotificationListeningChannelAdapterParserTests;
+import org.springframework.integration.jmx.config.OperationInvokingChannelAdapterParserTests;
+import org.springframework.integration.jmx.config.OperationInvokingOutboundGatewayTests;
+import org.springframework.integration.monitor.ExponentialMovingAverageCumulativeHistoryTests;
+import org.springframework.integration.monitor.ExponentialMovingAverageRatioCumulativeHistoryTests;
+import org.springframework.integration.monitor.HandlerMonitoringIntegrationTests;
import org.springframework.integration.monitor.MessageChannelsMonitorIntegrationTests;
/*
@@ -30,8 +39,13 @@ import org.springframework.integration.monitor.MessageChannelsMonitorIntegration
*
*/
@RunWith(Suite.class)
-@SuiteClasses(value = { ControlBusXmlTests.class, MessageChannelsMonitorIntegrationTests.class })
-@Ignore
+@SuiteClasses(value = { OperationInvokingMessageHandlerTests.class,
+ ExponentialMovingAverageCumulativeHistoryTests.class, OperationInvokingChannelAdapterParserTests.class,
+ HandlerMonitoringIntegrationTests.class, NotificationListeningMessageProducerTests.class,
+ OperationInvokingOutboundGatewayTests.class, NotificationListeningChannelAdapterParserTests.class,
+ ControlBusXmlTests.class, ExponentialMovingAverageRatioCumulativeHistoryTests.class,
+ AttributePollingMessageSourceTests.class, ControlBusTests.class, MessageChannelsMonitorIntegrationTests.class })
+// @Ignore
public class IgnoredTestSuite {
}
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java
index ca36142f16..4b654d20c7 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java
@@ -19,6 +19,7 @@ package org.springframework.integration.control;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.junit.After;
import org.junit.Test;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -40,11 +41,12 @@ import org.springframework.jmx.support.MBeanServerFactoryBean;
public class ControlBusOperationChannelTests {
private final String domain = "domain.test";
+ private GenericApplicationContext context;
@Test
public void replyProducingOperation() throws Exception {
- GenericApplicationContext context = new GenericApplicationContext();
+ context = new GenericApplicationContext();
RootBeanDefinition endpointDef = new RootBeanDefinition(EventDrivenConsumer.class);
endpointDef.getConstructorArgumentValues().addGenericArgumentValue(new DirectChannel());
endpointDef.getConstructorArgumentValues().addGenericArgumentValue(new RootBeanDefinition(TestHandler.class));
@@ -66,6 +68,11 @@ public class ControlBusOperationChannelTests {
assertFalse("endpoint should have been stopped", endpoint.isRunning());
controlBus.getOperationChannel().send(startMessage);
assertTrue("endpoint should be running after being restarted", endpoint.isRunning());
+ close();
+ }
+
+ @After
+ public void close() {
context.close();
}
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml
index 68177ab054..638163e89b 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml
@@ -16,9 +16,7 @@
-
-
-
+
@@ -28,6 +26,7 @@
+
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests.java
index 2250bc8547..b43003d698 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests.java
@@ -30,7 +30,6 @@ import org.springframework.integration.monitor.LifecycleMessageHandlerMonitor;
import org.springframework.integration.monitor.QueueChannelMonitor;
import org.springframework.integration.monitor.SimpleMessageChannelMonitor;
import org.springframework.jmx.support.ObjectNameManager;
-import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -41,7 +40,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
public class ControlBusXmlTests {
- private static final String DOMAIN = "spring.application";
+ private static final String DOMAIN = "control.bus.xml.test";
@Autowired
@@ -78,8 +77,6 @@ public class ControlBusXmlTests {
}
@Test
- // Assume this one runs last and force MBeans to be unregistered to avoid clashes in later tests
- @DirtiesContext
public void pollingConsumerRegistered() throws Exception {
ObjectInstance instance = mbeanServer.getObjectInstance(
ObjectNameManager.getInstance(DOMAIN + ":type=MessageHandler,name=testPollingBridge,bean=endpoint"));
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java
index 2b6a7ec99d..19bfa979d4 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java
@@ -22,7 +22,6 @@ 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;
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java
index 211cf10611..4df7c4ece6 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.runner.RunWith;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.integration.MessageChannel;
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java
index 9ac72dc5b1..5cff64a9b9 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java
@@ -24,7 +24,6 @@ import javax.management.Notification;
import org.junit.Test;
import org.junit.runner.RunWith;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.Message;
import org.springframework.integration.core.PollableChannel;
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java
index 9a311ef1b2..7c6cc8b408 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java
@@ -25,7 +25,6 @@ import javax.management.Notification;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java
index 52e1fdcd5d..9f80459618 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java
index 9cdd1d9fae..7fe10e5ece 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.integration.MessageChannel;
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests-context.xml
index 4554eeaea2..564cca97a9 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests-context.xml
@@ -13,8 +13,9 @@
-
+
+
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests.java
index 61bb68a8da..4aac751379 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests.java
@@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.core.PollableChannel;
import org.springframework.integration.message.GenericMessage;
-import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -39,7 +38,6 @@ public class ChannelIntegrationTests {
private IntegrationMBeanExporter messageChannelsMonitor;
@Test
- @DirtiesContext
public void testMessageChannelStatistics() throws Exception {
requests.send(new GenericMessage("foo"));
diff --git a/spring-integration-jmx/template.mf b/spring-integration-jmx/template.mf
index 524c4b6dcf..6e4676f90e 100644
--- a/spring-integration-jmx/template.mf
+++ b/spring-integration-jmx/template.mf
@@ -6,5 +6,6 @@ Import-Template:
org.springframework.integration.*;version="[2.0.0, 2.0.1)",
org.springframework.*;version="[3.0.3, 4.0.0)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+ org.aopalliance.*;version="[1.0.0, 2.0.0)",
javax.management.*;version="0",
org.w3c.dom.*;version="0"