From cbd1a06a2c58f9d99cb59edb71d4c37c4d82a14f Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Wed, 22 Aug 2012 12:24:00 -0400
Subject: [PATCH] INTSAMPLES-81 File Sample: Fix FWMH Field Access

FileWritingMessageHandler:

Sample accessed 'destinationDirectory' field; it
is now 'destinationDirectoryExpression'.
---
 basic/file/pom.xml                              | 17 ++++++++++-------
 .../samples/filecopy/FileCopyDemoCommon.java    |  9 ++++++---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/basic/file/pom.xml b/basic/file/pom.xml
index 722b1d5e..75d59ccc 100644
--- a/basic/file/pom.xml
+++ b/basic/file/pom.xml
@@ -4,13 +4,16 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>file</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Basic) - File Copy</name>
 	<packaging>jar</packaging>
+	<prerequisites>
+		<maven>2.2.1</maven>
+	</prerequisites>
 	<properties>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
-		<log4j.version>1.2.16</log4j.version>
+		<spring.integration.version>2.2.0.RC2</spring.integration.version>
+		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
@@ -36,13 +39,13 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>2.5.1</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.6</source>
+					<target>1.6</target>
 					<compilerArgument>-Xlint:all</compilerArgument>
 					<showWarnings>true</showWarnings>
-					<showDeprecation>false</showDeprecation>
+					<showDeprecation>true</showDeprecation>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/basic/file/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java b/basic/file/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
index 72fb0187..627c5b27 100644
--- a/basic/file/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
+++ b/basic/file/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -20,20 +20,23 @@ import java.io.File;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.ApplicationContext;
+import org.springframework.expression.common.LiteralExpression;
 import org.springframework.integration.file.FileReadingMessageSource;
 import org.springframework.integration.file.FileWritingMessageHandler;
 
 /**
  * Displays the names of the input and output directories.
- * 
+ *
  * @author Marius Bogoevici
  * @author Mark Fisher
+ * @author Gary Russell
  */
 public class FileCopyDemoCommon {
 
 	public static void displayDirectories(ApplicationContext context) {
 		File inDir = (File) new DirectFieldAccessor(context.getBean(FileReadingMessageSource.class)).getPropertyValue("directory");
-		File outDir = (File) new DirectFieldAccessor(context.getBean(FileWritingMessageHandler.class)).getPropertyValue("destinationDirectory");
+		LiteralExpression expression = (LiteralExpression) new DirectFieldAccessor(context.getBean(FileWritingMessageHandler.class)).getPropertyValue("destinationDirectoryExpression");
+		File outDir = new File(expression.getValue());
 		System.out.println("Input directory is: " + inDir.getAbsolutePath());
 		System.out.println("Output directory is: " + outDir.getAbsolutePath());
 		System.out.println("===================================================");