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

The <poller/> element now accepts the "interval" attribute for an IntervalTrigger instead of "period".

Browse Source
This commit is contained in:
Mark Fisher
2008-09-24 19:40:38 +00:00
parent b52a2bb551
commit b0fc5da6a2
14 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
View File

@@ -141,11 +141,11 @@ public abstract class IntegrationNamespaceUtils {
*/
public static void configureTrigger(Element pollerElement, BeanDefinitionBuilder targetBuilder) {
Trigger trigger = null;
String interval = pollerElement.getAttribute("period");
String interval = pollerElement.getAttribute("interval");
String cron = pollerElement.getAttribute("cron");
if (!(StringUtils.hasText(interval) ^ StringUtils.hasText(cron))) {
throw new ConfigurationException(
"A <poller> element must define either a period or a cron expression (but not both).");
"A <poller> element must include either an 'interval' or a 'cron' expression (but not both).");
}
if (StringUtils.hasText(interval)) {
Long period = Long.valueOf(interval);

2
org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
View File

@@ -245,7 +245,7 @@
<xsd:sequence>
<xsd:element name="transactional" type="transactionalType" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
<xsd:attribute name="period" type="xsd:long"/>
<xsd:attribute name="interval" type="xsd:long"/>
<xsd:attribute name="cron" type="xsd:string"/>
<xsd:attribute name="initial-delay" type="xsd:long"/>
<xsd:attribute name="fixed-rate" type="xsd:boolean"/>

2
org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
View File

@@ -18,7 +18,7 @@
<outbound-channel-adapter id="methodInvokingConsumer" ref="testBean" method="store"/>
<inbound-channel-adapter id="methodInvokingSource" ref="testBean" method="getMessage" channel="queueChannel">
<poller period="10000" max-messages-per-poll="1"/>
<poller interval="10000" max-messages-per-poll="1"/>
</inbound-channel-adapter>
<beans:bean id="consumer" class="org.springframework.integration.config.TestConsumer"/>

2
org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
View File

@@ -15,7 +15,7 @@
<service-activator id="endpoint" input-channel="testChannel"
ref="testHandler" selector="typeSelector">
<poller period="100"/>
<poller interval="100"/>
</service-activator>
<beans:bean id="typeSelector" class="org.springframework.integration.message.selector.PayloadTypeSelector">

2
org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
View File

@@ -14,7 +14,7 @@
</channel>
<service-activator input-channel="testChannel" ref="testHandler">
<poller period="100"/>
<poller interval="100"/>
</service-activator>
<beans:bean id="testHandler" class="org.springframework.integration.config.TestHandler">

2
org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
View File

@@ -26,7 +26,7 @@
ref="testBean"
method="good"
output-channel="output">
<poller period="10000" max-messages-per-poll="1">
<poller interval="10000" max-messages-per-poll="1">
<transactional transaction-manager="txManager" propagation="MANDATORY"/>
</poller>
</service-activator>

2
org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
View File

@@ -22,7 +22,7 @@
ref="testBean"
method="good"
output-channel="output">
<poller period="10000" max-messages-per-poll="1">
<poller interval="10000" max-messages-per-poll="1">
<transactional transaction-manager="txManager" propagation="NOT_SUPPORTED"/>
</poller>
</service-activator>

2
org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
View File

@@ -22,7 +22,7 @@
ref="testBean"
method="good"
output-channel="output">
<poller period="10000" max-messages-per-poll="1">
<poller interval="10000" max-messages-per-poll="1">
<transactional transaction-manager="txManager" propagation="REQUIRED"/>
</poller>
</service-activator>

2
org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
View File

@@ -22,7 +22,7 @@
ref="testBean"
method="good"
output-channel="output">
<poller period="10000" max-messages-per-poll="1">
<poller interval="10000" max-messages-per-poll="1">
<transactional transaction-manager="txManager" propagation="REQUIRES_NEW"/>
</poller>
</service-activator>

2
org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
View File

@@ -22,7 +22,7 @@
ref="testBean"
method="good"
output-channel="output">
<poller period="10000" max-messages-per-poll="1">
<poller interval="10000" max-messages-per-poll="1">
<transactional transaction-manager="txManager" propagation="SUPPORTS"/>
</poller>
</service-activator>

16
org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
View File

@@ -22,19 +22,19 @@
</channel>
<service-activator input-channel="badInput"
ref="testBean"
method="bad"
output-channel="output">
<poller period="10000" max-messages-per-poll="1">
ref="testBean"
method="bad"
output-channel="output">
<poller interval="10000" max-messages-per-poll="1">
<transactional transaction-manager="txManager"/>
</poller>
</service-activator>
<service-activator input-channel="goodInput"
ref="testBean"
method="good"
output-channel="output">
<poller period="10000" max-messages-per-poll="1">
ref="testBean"
method="good"
output-channel="output">
<poller interval="10000" max-messages-per-poll="1">
<transactional transaction-manager="txManager"/>
</poller>
</service-activator>