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

The <poller/> element no longer defines trigger properties (interval, initial-delay, cron, etc). Instead it expects a sub-element - either <interval-trigger/> or <cron-trigger/> (INT-423).

Browse Source
This commit is contained in:
Mark Fisher
2008-10-14 12:25:56 +00:00
parent 47ec57c5cd
commit 7ccc8f28d5
16 changed files with 101 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests-context.xml
View File

@@ -5,22 +5,29 @@
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
<message-bus enable-annotations="true"/>
<channel id="input">
<queue capacity="5"/>
</channel>
<aggregator ref="summer" method="sum" input-channel="input"
output-channel="output">
<poller task-executor="executor" interval="20" max-messages-per-poll="5"/>
<aggregator ref="summer" method="sum" input-channel="input" output-channel="output">
<poller task-executor="executor" max-messages-per-poll="5">
<interval-trigger interval="20"/>
</poller>
</aggregator>
<beans:bean id="executor"
class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
<beans:property name="corePoolSize" value="5" />
</beans:bean>
<channel id="output">
<queue capacity="5" />
</channel>
<beans:bean id="summer"
class="org.springframework.integration.aggregator.integration.ConcurrentAggregatorIntegrationTests$SummingAggregator" />
</beans:beans>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -25,7 +25,8 @@
ref="testBean"
method="bad"
output-channel="output">
<poller interval="10000" max-messages-per-poll="1">
<poller max-messages-per-poll="1">
<interval-trigger interval="10000"/>
<transactional transaction-manager="txManager"/>
</poller>
</service-activator>
@@ -34,7 +35,8 @@
ref="testBean"
method="good"
output-channel="output">
<poller interval="10000" max-messages-per-poll="1">
<poller max-messages-per-poll="1">
<interval-trigger interval="10000"/>
<transactional transaction-manager="txManager"/>
</poller>
</service-activator>