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

---
 .../integration/samples/filecopy/fileCopyDemo-binary.xml      | 4 +---
 .../integration/samples/filecopy/fileCopyDemo-file.xml        | 4 +---
 .../integration/samples/filecopy/fileCopyDemo-text.xml        | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
index 4417e6d2e1..0a931d2977 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
@@ -27,8 +27,6 @@
 
 	<bean id="handler" class="org.springframework.integration.samples.filecopy.Handler"/>
 
-	<integration:poller id="poller" default="true">
-		<integration:interval-trigger interval="5000"/>
-	</integration:poller>
+	<integration:poller id="poller" default="true" fixed-delay="5000"/>
 
 </beans>
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
index 17c3a5c6ac..e38e27abc5 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
@@ -14,9 +14,7 @@
 
 	<file:inbound-channel-adapter id="filesIn"
 	                              directory="file:${java.io.tmpdir}/spring-integration-samples/input">
-		<integration:poller>
-			<integration:interval-trigger interval="5000"/>
-		</integration:poller>
+	    <integration:poller id="poller" fixed-delay="5000"/>
 	</file:inbound-channel-adapter>
 
 	<integration:service-activator input-channel="filesIn"
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
index 1cc3f6638c..ea48b92798 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
@@ -15,9 +15,7 @@
 	<file:inbound-channel-adapter id="filesIn"
 	                              directory="file:${java.io.tmpdir}/spring-integration-samples/input"
 	                              filename-pattern="[a-z]+.txt">
-		<integration:poller>
-			<integration:interval-trigger interval="5000"/>
-		</integration:poller>
+		<integration:poller id="poller" default="true" fixed-delay="5000"/>
 	</file:inbound-channel-adapter>
 
 	<file:file-to-string-transformer input-channel="filesIn" output-channel="strings"/>