From 845474263d48f68bf2923a7034b3880a79c478bd Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Mon, 22 Sep 2008 04:50:31 +0000
Subject: [PATCH] File copy samples now use the new
 'org.springframework.integration.file' module with the
 <file:inbound-channel-adapter/> and <file:outbound-channel-adapter/>
 elements.

---
 .../samples/filecopy/fileCopyDemo-binary.xml  | 40 ++++++++++++++---
 .../samples/filecopy/fileCopyDemo-common.xml  | 28 ------------
 .../samples/filecopy/fileCopyDemo-file.xml    | 30 ++++++++++---
 .../samples/filecopy/fileCopyDemo-text.xml    | 43 +++++++++++++++----
 4 files changed, 90 insertions(+), 51 deletions(-)
 delete mode 100644 org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-common.xml

diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
index 9718cbe722..4c4c94e6e9 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
@@ -1,14 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:file="http://www.springframework.org/schema/integration/file"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			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">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/file
+			http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
 
-	<beans:import resource="fileCopyDemo-common.xml"/>
-	
-	<file-source id="fileSource" type="binary" directory="${java.io.tmpdir}/spring-integration-samples/input"/>
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-</beans:beans>
+	<integration:message-bus/>
+
+	<file:inbound-channel-adapter id="filesIn"
+	                              directory="file:${java.io.tmpdir}/spring-integration-samples/input"/>
+
+	<bean class="org.springframework.integration.transformer.TransformerEndpoint">
+		<constructor-arg>
+			<bean class="org.springframework.integration.file.transformer.FileToByteArrayTransformer">
+				<property name="deleteFileAfterTransformation" value="true"/>
+			</bean>
+		</constructor-arg>
+		<property name="inputChannel" ref="filesIn"/>
+		<property name="outputChannel" ref="bytes"/>
+	</bean>
+
+	<integration:channel id="bytes"/>
+
+	<integration:service-activator input-channel="bytes"
+	                               output-channel="filesOut"
+                                   ref="exclaimer" method="exclaim"/>
+
+	<file:outbound-channel-adapter id="filesOut" directory="${java.io.tmpdir}/spring-integration-samples/output"/>
+
+	<bean id="exclaimer" class="org.springframework.integration.samples.filecopy.Exclaimer"/>
+
+</beans>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-common.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-common.xml
deleted file mode 100644
index ce8720ae82..0000000000
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-common.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			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">
-
-	<beans:bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-	<message-bus/>
-
-	<channel-adapter id="channel1" source="fileSource">
-		<poller period="5000"/>
-	</channel-adapter>
-
-	<service-activator input-channel="channel1"
-	                   output-channel="channel2"
-                       ref="exclaimer" method="exclaim"/>
-
-	<channel-adapter id="channel2" target="fileTarget"/>
-
-	<file-target id="fileTarget" directory="${java.io.tmpdir}/spring-integration-samples/output"/>
-
-	<beans:bean id="exclaimer" class="org.springframework.integration.samples.filecopy.Exclaimer"/>
-
-</beans:beans>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
index 78b3ad2616..41e83532a7 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
@@ -1,14 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:file="http://www.springframework.org/schema/integration/file"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			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">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/file
+			http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
 
-	<beans:import resource="fileCopyDemo-common.xml"/>
-	
-	<file-source id="fileSource" type="file" directory="${java.io.tmpdir}/spring-integration-samples/input"/>
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-</beans:beans>
+	<integration:message-bus/>
+
+	<file:inbound-channel-adapter id="filesIn"
+	                              directory="file:${java.io.tmpdir}/spring-integration-samples/input">
+		<integration:poller period="5000"/>
+	</file:inbound-channel-adapter>
+
+	<integration:service-activator input-channel="filesIn"
+	                               output-channel="filesOut"
+                                   ref="exclaimer" method="exclaim"/>
+
+	<file:outbound-channel-adapter id="filesOut" directory="${java.io.tmpdir}/spring-integration-samples/output"/>
+
+	<bean id="exclaimer" class="org.springframework.integration.samples.filecopy.Exclaimer"/>
+
+</beans>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
index ed6de5f505..a714abafd8 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
@@ -1,16 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:file="http://www.springframework.org/schema/integration/file"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			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">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/file
+			http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
 
-	<beans:import resource="fileCopyDemo-common.xml"/>
-	
-	<file-source id="fileSource" type="text"
-		         filename-pattern="[a-z]+.txt"
-	             directory="${java.io.tmpdir}/spring-integration-samples/input"/>
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-</beans:beans>
+	<integration:message-bus/>
+
+	<file:inbound-channel-adapter id="filesIn"
+	                              directory="file:${java.io.tmpdir}/spring-integration-samples/input"
+	                              filename-pattern="[a-z]+.txt"/>
+
+	<bean class="org.springframework.integration.transformer.TransformerEndpoint">
+		<constructor-arg>
+			<bean class="org.springframework.integration.file.transformer.FileToStringTransformer">
+				<property name="deleteFileAfterTransformation" value="true"/>
+			</bean>
+		</constructor-arg>
+		<property name="inputChannel" ref="filesIn"/>
+		<property name="outputChannel" ref="strings"/>
+	</bean>
+
+	<integration:channel id="strings"/>
+
+	<integration:service-activator input-channel="strings"
+	                               output-channel="filesOut"
+                                   ref="exclaimer" method="exclaim"/>
+
+	<file:outbound-channel-adapter id="filesOut" directory="${java.io.tmpdir}/spring-integration-samples/output"/>
+
+	<bean id="exclaimer" class="org.springframework.integration.samples.filecopy.Exclaimer"/>
+
+</beans>