INT-1495: harmonise schema

This commit is contained in:
Dave Syer
2010-10-06 07:10:12 -07:00
parent 76d17bd187
commit cbf0242bd9
13 changed files with 18 additions and 17 deletions

View File

@@ -25,9 +25,7 @@
object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBean1"
attribute-name="FirstMessage"
auto-startup="false">
<si:poller max-messages-per-poll="1">
<si:interval-trigger interval="2000"/>
</si:poller>
<si:poller max-messages-per-poll="1" fixed-rate="2000"/>
</jmx:attribute-polling-channel-adapter>
<bean id="testBean1" class="org.springframework.integration.jmx.config.TestBean"/>

View File

@@ -19,6 +19,6 @@
<jmx:control-bus mbean-exporter="mbeanExporter" operation-channel="testChannel"/>
<jmx:mbean-exporter id="mbeanExporter" mbean-server="mbs" domain="tests.ControlBusParser"/>
<jmx:mbean-export id="mbeanExporter" server="mbs" domain="tests.ControlBusParser"/>
</beans>

View File

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

View File

@@ -13,14 +13,18 @@
http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd">
<context:mbean-server id="mbs" />
<context:mbean-export server="mbs"/>
<int:channel id="testChannel" />
<int:inbound-channel-adapter channel="testChannel" method="get">
<bean class="org.springframework.integration.jmx.config.PollingAdapterMBeanTests$Source"/>
<int:poller fixed-rate="5000"/>
<int:poller fixed-rate="5000" max-messages-per-poll="1"/>
</int:inbound-channel-adapter>
<int:logging-channel-adapter channel="testChannel"/>
<jmx:mbean-export server="mbs"/>
</beans>

View File

@@ -46,7 +46,6 @@ public class PollingAdapterMBeanTests {
public static class Source {
public String get() {
System.err.println("*** " + System.currentTimeMillis());
return "foo";
}
}

View File

@@ -17,14 +17,14 @@
<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"
<jmx:mbean-export id="mbeanExporter" server="mbs"
domain="tests.MBeanExpoerterParser" />
</beans>