Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QUALITY: moved ControlBus to avoid cyclic dependency

Browse Source
This commit is contained in:
Iwein Fuld
2010-10-21 18:08:20 +02:00
parent 804485e30f
commit 064b86b29c
7 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-integration-jmx/src/main/java/org/springframework/integration/control/ControlBus.java → spring-integration-jmx/src/main/java/org/springframework/integration/jmx/ControlBus.java
View File

@@ -14,9 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.control;
import javax.management.MBeanServer;
package org.springframework.integration.jmx;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
@@ -26,12 +24,12 @@ import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.SubscribableChannel;
import org.springframework.integration.jmx.JmxHeaders;
import org.springframework.integration.jmx.OperationInvokingMessageHandler;
import org.springframework.integration.monitor.ObjectNameLocator;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.util.Assert;
import javax.management.MBeanServer;
/**
* JMX-based Control Bus implementation. Routes control messages on an operation channel to the other control points
* (channels and handlers) via JMX. To use the control bus send a message to the operation channel with a header

2
spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/ControlBusFactoryBean.java
View File

@@ -17,7 +17,7 @@ package org.springframework.integration.jmx.config;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.control.ControlBus;
import org.springframework.integration.jmx.ControlBus;
import org.springframework.integration.core.SubscribableChannel;
import org.springframework.integration.monitor.IntegrationMBeanExporter;

1
spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java
View File

@@ -29,6 +29,7 @@ import org.springframework.integration.Message;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.jmx.ControlBus;
import org.springframework.integration.jmx.JmxHeaders;
import org.springframework.integration.monitor.IntegrationMBeanExporter;
import org.springframework.integration.support.MessageBuilder;

2
spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java
View File

@@ -32,7 +32,6 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.integration.Message;
@@ -42,6 +41,7 @@ import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.endpoint.PollingConsumer;
import org.springframework.integration.handler.BridgeHandler;
import org.springframework.integration.jmx.ControlBus;
import org.springframework.integration.monitor.IntegrationMBeanExporter;
import org.springframework.integration.monitor.LifecycleMessageHandlerMetrics;
import org.springframework.integration.monitor.QueueChannelMetrics;

2
spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml
View File

@@ -21,7 +21,7 @@
<int:poller max-messages-per-poll="1" fixed-rate="10000" />
</int:bridge>
<bean id="controlBus" class="org.springframework.integration.control.ControlBus">
<bean id="controlBus" class="org.springframework.integration.jmx.ControlBus">
<constructor-arg ref="mbeanExporter" />
<constructor-arg ref="mbeanServer" />
<constructor-arg ref="controlChannel" />

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

@@ -25,7 +25,7 @@ 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.integration.jmx.ControlBus;
import org.springframework.jmx.export.MBeanExporter;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

2
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests-context.xml
View File

@@ -8,7 +8,7 @@
<int:channel id="controlChannel" />
<bean id="controlBus" class="org.springframework.integration.control.ControlBus">
<bean id="controlBus" class="org.springframework.integration.jmx.ControlBus">
<constructor-arg ref="mbeanExporter" />
<constructor-arg ref="mbeanServer" />
<constructor-arg ref="controlChannel" />