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

---
 .../integration/samples/cafe/annotation/cafeDemo.xml      | 8 ++------
 .../integration/samples/cafe/xml/cafeDemo.xml             | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
index ead59e5ad0..103bd5d435 100644
--- a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
+++ b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
@@ -28,15 +28,11 @@
     <channel id="preparedDrinks"/>
 
 	<bridge input-channel="coldDrinks" output-channel="coldDrinkBarista">
-		<poller>
-			<interval-trigger interval="1000"/>
-		</poller>
+		<poller fixed-delay="1000"/>
 	</bridge>
 
 	<bridge input-channel="hotDrinks" output-channel="hotDrinkBarista">
-		<poller>
-			<interval-trigger interval="1000"/>
-		</poller>
+		<poller fixed-delay="1000"/>
 	</bridge>
 
 	<stream:stdout-channel-adapter id="deliveries"/>
diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
index 614d6d2895..8c6600183c 100644
--- a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
+++ b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
@@ -37,8 +37,6 @@
 
 	<beans:bean id="barista" class="org.springframework.integration.samples.cafe.xml.Barista"/>
 
-	<poller id="poller" default="true">
-		<interval-trigger interval="1000"/>
-	</poller>
+	<poller id="poller" default="true" fixed-delay="1000"/>
 
 </beans:beans>