From 48c8c37c23c1210ddec5075264efe66fdaf832d9 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 16 Jul 2009 22:02:08 +0000
Subject: [PATCH] INT-729 Added log4j configuration to the File copy samples.

---
 .../filecopy/src/main/java/log4j.xml          | 28 +++++++++++++++++++
 .../samples/filecopy/BinaryFileCopyDemo.java  |  4 ++-
 .../samples/filecopy/FileCopyDemoCommon.java  |  1 +
 .../filecopy/{Exclaimer.java => Handler.java} | 10 +++----
 .../samples/filecopy/fileCopyDemo-binary.xml  |  4 +--
 .../samples/filecopy/fileCopyDemo-file.xml    |  4 +--
 .../samples/filecopy/fileCopyDemo-text.xml    |  4 +--
 7 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 spring-integration-samples/filecopy/src/main/java/log4j.xml
 rename spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/{Exclaimer.java => Handler.java} (84%)

diff --git a/spring-integration-samples/filecopy/src/main/java/log4j.xml b/spring-integration-samples/filecopy/src/main/java/log4j.xml
new file mode 100644
index 0000000000..a01d5446a0
--- /dev/null
+++ b/spring-integration-samples/filecopy/src/main/java/log4j.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+	<!-- Appenders -->
+	<appender name="console" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
+		</layout>
+	</appender>
+
+	<!-- Loggers -->
+	<logger name="org.springframework">
+		<level value="warn" />
+	</logger>
+
+	<logger name="org.springframework.integration">
+		<level value="warn" />
+	</logger>
+
+	<!-- Root Logger -->
+	<root>
+		<priority value="warn" />
+		<appender-ref ref="console" />
+	</root>
+
+</log4j:configuration>
\ No newline at end of file
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
index 12771de576..45348a224d 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/BinaryFileCopyDemo.java
@@ -20,7 +20,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * Demonstrating the file copy scenario using binary file source and target.
- * See the 'fileCopyDemo-binary.xml' configuration file for details.
+ * See the 'fileCopyDemo-binary.xml' configuration file for details. Notice
+ * that the transformer is configured to delete the source File after it
+ * extracts the content as a byte array.
  * 
  * @author Marius Bogoevici
  */
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
index cd60c28669..959deb34d8 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
@@ -31,6 +31,7 @@ public class FileCopyDemoCommon {
 		File outDir = new File(baseDir, "output");
 		System.out.println("Input directory is: " + inDir.getAbsolutePath());
 		System.out.println("Output directory is: " + outDir.getAbsolutePath());
+		System.out.println("===================================================");
 	}
 
 }
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/Handler.java
similarity index 84%
rename from spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java
rename to spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/Handler.java
index 0e73b95531..d7cc5c476b 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/Exclaimer.java
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/Handler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,19 +24,19 @@ import java.io.File;
  * @author Mark Fisher
  * @author Marius Bogoevici
  */
-public class Exclaimer {
+public class Handler {
 
-	public String exclaim(String input) {
+	public String handleString(String input) {
 		System.out.println("Copying text: " + input);
 		return input.toUpperCase();
 	}
 	
-	public File exclaim(File input) {
+	public File handleFile(File input) {
 		System.out.println("Copying file: " + input.getAbsolutePath());
 		return input;
 	}
 	
-	public byte[] exclaim(byte[] input) {
+	public byte[] handleBytes(byte[] input) {
 		System.out.println("Copying " + input.length + " bytes ...");
 		return new String(input).toUpperCase().getBytes();
 	}
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 4ab94b36a2..ad97b55dca 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
@@ -21,11 +21,11 @@
 
 	<integration:service-activator input-channel="bytes"
 	                               output-channel="filesOut"
-                                   ref="exclaimer" method="exclaim"/>
+                                   ref="handler"/>
 
 	<file:outbound-channel-adapter id="filesOut" directory="${java.io.tmpdir}/spring-integration-samples/output"/>
 
-	<bean id="exclaimer" class="org.springframework.integration.samples.filecopy.Exclaimer"/>
+	<bean id="handler" class="org.springframework.integration.samples.filecopy.Handler"/>
 
 	<integration:poller id="poller" default="true">
 		<integration:interval-trigger interval="5000"/>
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 69060100c0..226265521a 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
@@ -21,10 +21,10 @@
 
 	<integration:service-activator input-channel="filesIn"
 	                               output-channel="filesOut"
-                                   ref="exclaimer" method="exclaim"/>
+                                   ref="handler"/>
 
 	<file:outbound-channel-adapter id="filesOut" directory="${java.io.tmpdir}/spring-integration-samples/output"/>
 
-	<bean id="exclaimer" class="org.springframework.integration.samples.filecopy.Exclaimer"/>
+	<bean id="handler" class="org.springframework.integration.samples.filecopy.Handler"/>
 
 </beans>
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 de4d4df358..bb340fa52b 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
@@ -26,10 +26,10 @@
 
 	<integration:service-activator input-channel="strings"
 	                               output-channel="filesOut"
-                                   ref="exclaimer" method="exclaim"/>
+                                   ref="handler"/>
 
 	<file:outbound-channel-adapter id="filesOut" directory="${java.io.tmpdir}/spring-integration-samples/output"/>
 
-	<bean id="exclaimer" class="org.springframework.integration.samples.filecopy.Exclaimer"/>
+	<bean id="handler" class="org.springframework.integration.samples.filecopy.Handler"/>
 
 </beans>