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

removed deprecated trigger sub-elements non-core

Browse Source
This commit is contained in:
Mark Fisher
2011-08-31 07:01:40 -04:00
parent 46925cf3e4
commit 9f59001230
20 changed files with 26 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-context.xml
View File

@@ -5,8 +5,8 @@
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
@@ -56,9 +56,7 @@
<mail:inbound-channel-adapter id="pop3WithMaxFetchSize" store-uri="pop3:test" max-fetch-size="11" channel="testChannel" should-delete-messages="false" auto-startup="false"/>
<mail:inbound-channel-adapter id="pop3WithMaxFetchSizeFallsBackToPollerMax" store-uri="pop3:test" channel="testChannel" should-delete-messages="false" auto-startup="false">
<si:poller max-messages-per-poll="99">
<si:interval-trigger interval="30" time-unit="SECONDS"/>
</si:poller>
<si:poller max-messages-per-poll="99" fixed-rate="30000"/>
</mail:inbound-channel-adapter>
<mail:inbound-channel-adapter id="imapWithMaxFetchSize" store-uri="imap:test" max-fetch-size="22" channel="testChannel" should-delete-messages="false" auto-startup="false"/>
@@ -105,8 +103,6 @@
<si:channel id="testChannel"/>
<si:poller default="true" max-messages-per-poll="1">
<si:interval-trigger interval="60" time-unit="SECONDS"/>
</si:poller>
<si:poller default="true" max-messages-per-poll="1" fixed-rate="60000"/>
</beans>

10
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-invalidContext.xml
View File

@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:mail="http://www.springframework.org/schema/integration/mail"
xmlns:si="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<!-- INT-1163 -->
@@ -13,8 +13,6 @@
<si:channel id="testChannel"/>
<si:poller default="true" max-messages-per-poll="1">
<si:interval-trigger interval="60" time-unit="SECONDS"/>
</si:poller>
<si:poller default="true" max-messages-per-poll="1" fixed-delay="60000"/>
</beans>

4
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml
View File

@@ -25,8 +25,6 @@
<prop key="foo">bar</prop>
</util:properties>
<integration:poller default="true">
<integration:interval-trigger interval="60" time-unit="SECONDS"/>
</integration:poller>
<integration:poller default="true" fixed-rate="60000"/>
</beans>