From c1cbeecf3ab90aff9760af15029bfb1a3062a0fa Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 29 Jul 2010 22:58:04 +0000
Subject: [PATCH] INT-1291 removing deprecated sub-elements from <poller>
 elements in samples

---
 .../integration/samples/oddeven/cronOddEvenDemo.xml           | 4 +---
 .../integration/samples/oddeven/intervalOddEvenDemo.xml       | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
index 394bc6658e..eef728da26 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
@@ -13,9 +13,7 @@
 	<channel id="odd"/>
 
 	<inbound-channel-adapter id="numbers" ref="counter" method="next">
-		<poller max-messages-per-poll="1">
-			<cron-trigger expression="1,2,3,5,8,13,21,34,55 * * * * ?"/>
-		</poller>
+		<poller max-messages-per-poll="1" cron="1,2,3,5,8,13,21,34,55 * * * * ?"/>
 	</inbound-channel-adapter>
 
 	<filter input-channel="numbers" output-channel="positives"
diff --git a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
index a47e188445..a155d20532 100644
--- a/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
+++ b/spring-integration-samples/oddeven/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
@@ -13,9 +13,7 @@
 	<channel id="odd"/>
 
 	<inbound-channel-adapter id="numbers" ref="counter" method="next">
-		<poller max-messages-per-poll="1">
-			<interval-trigger interval="3" time-unit="SECONDS"/>
-		</poller>
+		<poller max-messages-per-poll="1" fixed-delay="3000"/>
 	</inbound-channel-adapter>
 
 	<filter input-channel="numbers" output-channel="positives"