From f89b7c939fa8154ea3938a00fa4c59759e32aeb2 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 16 Jul 2009 03:16:25 +0000
Subject: [PATCH] INT-724, INT-725 Modified file copy samples to rely on the
 new directory auto-creation functionality.

---
 .../samples/filecopy/BinaryFileCopyDemo.java  |  2 +-
 .../filecopy/FileBasedFileCopyDemo.java       |  2 +-
 .../samples/filecopy/FileCopyDemoCommon.java  | 25 +++++++------------
 .../samples/filecopy/TextFileCopyDemo.java    |  2 +-
 4 files changed, 12 insertions(+), 19 deletions(-)

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 5e8431bd3e..12771de576 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
@@ -27,7 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class BinaryFileCopyDemo {
 
 	public static void main(String[] args) {
-		FileCopyDemoCommon.setupDirectories();
+		FileCopyDemoCommon.displayDirectories();
 		new ClassPathXmlApplicationContext("fileCopyDemo-binary.xml", BinaryFileCopyDemo.class);
 	}
 
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
index 23426ef78b..463919e6ec 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyDemo.java
@@ -27,7 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class FileBasedFileCopyDemo {
 
 	public static void main(String[] args) {
-		FileCopyDemoCommon.setupDirectories();
+		FileCopyDemoCommon.displayDirectories();
 		new ClassPathXmlApplicationContext("fileCopyDemo-file.xml", FileBasedFileCopyDemo.class);
 	}
 
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 66a4edc7db..cd60c28669 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
@@ -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.
@@ -19,25 +19,18 @@ package org.springframework.integration.samples.filecopy;
 import java.io.File;
 
 /**
- * Common functionality for the file demo.
+ * Displays the names of the input and output directories.
  * 
  * @author Marius Bogoevici
  */
 public class FileCopyDemoCommon {
 
-	public static void setupDirectories() {
-		String tmpDirPath = System.getProperty("java.io.tmpdir");
-		File parentDir = new File(tmpDirPath + File.separator + "spring-integration-samples");
-		File inDir = new File(parentDir, "input");
-		File outDir = new File(parentDir, "output");
-		if ((inDir.exists() || inDir.mkdirs()) && (outDir.exists() || outDir.mkdirs())) {
-			System.out.println("input directory is: " + inDir.getAbsolutePath());
-			System.out.println("output directory is: " + outDir.getAbsolutePath());
-		}
-		else {
-			System.err.println("failed to create directories within tmp dir: " + tmpDirPath);
-			System.exit(0);
-		}
+	public static void displayDirectories() {
+		File baseDir = new File(System.getProperty("java.io.tmpdir") + File.separator + "spring-integration-samples");
+		File inDir = new File(baseDir, "input");
+		File outDir = new File(baseDir, "output");
+		System.out.println("Input directory is: " + inDir.getAbsolutePath());
+		System.out.println("Output directory is: " + outDir.getAbsolutePath());
 	}
-	
+
 }
diff --git a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
index 35d8a7dd9a..60f5285f1f 100644
--- a/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
+++ b/spring-integration-samples/filecopy/src/main/java/org/springframework/integration/samples/filecopy/TextFileCopyDemo.java
@@ -28,7 +28,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class TextFileCopyDemo {
 
 	public static void main(String[] args) {
-		FileCopyDemoCommon.setupDirectories();
+		FileCopyDemoCommon.displayDirectories();
 		new ClassPathXmlApplicationContext("fileCopyDemo-text.xml", TextFileCopyDemo.class);
 	}