INT-1495: harmonise schema
This commit is contained in:
Dave Syer
@@ -39,7 +39,7 @@ public class AttributePollingChannelAdapterParser extends AbstractPollingInbound
|
||||
protected String parseSource(Element element, ParserContext parserContext) {
|
||||
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(
|
||||
"org.springframework.integration.jmx.AttributePollingMessageSource");
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "mbean-server", "server");
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "server", "server");
|
||||
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "object-name");
|
||||
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "attribute-name");
|
||||
return BeanDefinitionReaderUtils.registerWithGeneratedName(
|
||||
|
||||
@@ -33,7 +33,7 @@ public class JmxNamespaceHandler extends AbstractIntegrationNamespaceHandler {
|
||||
this.registerBeanDefinitionParser("attribute-polling-channel-adapter", new AttributePollingChannelAdapterParser());
|
||||
this.registerBeanDefinitionParser("notification-listening-channel-adapter", new NotificationListeningChannelAdapterParser());
|
||||
this.registerBeanDefinitionParser("notification-publishing-channel-adapter", new NotificationPublishingChannelAdapterParser());
|
||||
this.registerBeanDefinitionParser("mbean-exporter", new MBeanExporterParser());
|
||||
this.registerBeanDefinitionParser("mbean-export", new MBeanExporterParser());
|
||||
this.registerBeanDefinitionParser("control-bus", new ControlBusParser());
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ public class MBeanExporterParser extends AbstractSingleBeanDefinitionParser {
|
||||
}
|
||||
|
||||
private Object getMBeanServer(Element element, ParserContext parserContext) {
|
||||
String mbeanServer = element.getAttribute("mbean-server");
|
||||
String mbeanServer = element.getAttribute("server");
|
||||
if (StringUtils.hasText(mbeanServer)) {
|
||||
return new RuntimeBeanReference(mbeanServer);
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ public class NotificationListeningChannelAdapterParser extends AbstractSimpleBea
|
||||
parserContext.getReaderContext().error("The 'channel' attribute is required.", source);
|
||||
}
|
||||
builder.addPropertyReference("outputChannel", channel);
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "mbean-server", "server");
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "server");
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "notification-filter", "filter");
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "handback");
|
||||
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout");
|
||||
|
||||
@@ -39,7 +39,7 @@ public class OperationInvokingChannelAdapterParser extends AbstractOutboundChann
|
||||
protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
|
||||
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(
|
||||
"org.springframework.integration.jmx.OperationInvokingMessageHandler");
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "mbean-server", "server");
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "server");
|
||||
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "object-name");
|
||||
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "operation-name");
|
||||
return builder.getBeanDefinition();
|
||||
|
||||
@@ -37,7 +37,7 @@ public class OperationInvokingOutboundGatewayParser extends AbstractConsumerEndp
|
||||
ParserContext parserContext) {
|
||||
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(
|
||||
"org.springframework.integration.jmx.OperationInvokingMessageHandler");
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "mbean-server", "server");
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "server");
|
||||
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "object-name");
|
||||
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "operation-name");
|
||||
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "reply-channel", "outputChannel");
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
|
||||
<xsd:element name="mbean-exporter">
|
||||
<xsd:element name="mbean-export">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Exports Message Channels and Endpoints as MBeans.
|
||||
@@ -186,7 +186,7 @@
|
||||
|
||||
<xsd:complexType name="mbeanServerIdentifyerType">
|
||||
<xsd:attribute name="id" type="xsd:ID" use="optional" />
|
||||
<xsd:attribute name="mbean-server" type="xsd:string" default="mbeanServer">
|
||||
<xsd:attribute name="server" type="xsd:string" default="mbeanServer">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Defines the name of the MBeanServer bean to connect to.
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -46,7 +46,6 @@ public class PollingAdapterMBeanTests {
|
||||
|
||||
public static class Source {
|
||||
public String get() {
|
||||
System.err.println("*** " + System.currentTimeMillis());
|
||||
return "foo";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user