From 3b94b488392ab496dbaf05e93fd0681ccddea1d2 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Tue, 24 Jul 2012 09:18:40 +0300
Subject: [PATCH 1/2] remove maven repo

---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7ad02d00..6f93099c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,6 @@ version = "$springGemfireVersion"
 repositories {
   maven { url "http://repo.springsource.org/libs-snapshot" }
   maven { url "http://repo.springsource.org/plugins-release" }
-  maven { url "http://repo1.maven.org/maven2" }
 }
 
 

From fe23d796b8d8fed280c4196c45523a5c8427080b Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski@gmail.com>
Date: Tue, 24 Jul 2012 10:38:33 -0400
Subject: [PATCH 2/2] fixed windows build

---
 .../data/gemfire/ForkUtil.java                | 36 ++++++++++---------
 .../config/DynamicRegionNamespaceTest.java    |  4 ++-
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/test/java/org/springframework/data/gemfire/ForkUtil.java b/src/test/java/org/springframework/data/gemfire/ForkUtil.java
index 350d767e..da465aaa 100644
--- a/src/test/java/org/springframework/data/gemfire/ForkUtil.java
+++ b/src/test/java/org/springframework/data/gemfire/ForkUtil.java
@@ -35,27 +35,24 @@ public class ForkUtil {
 
 	public static OutputStream cloneJVM(String argument) {
 		String cp = System.getProperty("java.class.path");
-		String home = System.getProperty("java.home");
-
-		Process proc = null;
+		String home = System.getProperty("java.home");	
 		String sp = System.getProperty("file.separator");
 		String java = home + sp + "bin" + sp + "java";
-		String argCp = " -cp " + cp;
 		String argClass = argument;
+		String cmd = java + "-cp " + cp + " " + argClass;
 
-		String cmd = java + argCp + " " + argClass;
+		final Process proc; 
 		try {
-			//ProcessBuilder builder = new ProcessBuilder(cmd, argCp, argClass);
-			//builder.redirectErrorStream(true);
-			proc = Runtime.getRuntime().exec(cmd);
+			ProcessBuilder builder = new ProcessBuilder(java , "-cp", cp, argClass);
+			builder.redirectErrorStream(true);
+			proc = builder.start();
 		} catch (IOException ioe) {
 			throw new IllegalStateException("Cannot start command " + cmd, ioe);
 		}
 
 		System.out.println("Started fork from command\n" + cmd);
-		final Process p = proc;
-
-		final BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+		
+		final BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream()));
 		final AtomicBoolean run = new AtomicBoolean(true);
 
 		Thread reader = new Thread(new Runnable() {
@@ -83,11 +80,11 @@ public class ForkUtil {
 				System.out.println("Stopping fork...");
 				run.set(false);
 				os = null;
-				if (p != null)
-					p.destroy();
+				if (proc != null)
+					proc.destroy();
 
 				try {
-					p.waitFor();
+					proc.waitFor();
 				} catch (InterruptedException e) {
 					// ignore
 				}
@@ -134,17 +131,22 @@ public class ForkUtil {
 	}
 
 	public static boolean deleteControlFile(String name) {
-		String path = TEMP_DIR + File.separator + name;
+		String path = getControlFilePath(name);
 		return new File(path).delete();
 	}
 
 	public static boolean createControlFile(String name) throws IOException {
-		String path = TEMP_DIR + File.separator + name;
+		String path = getControlFilePath(name);
+		System.out.println("creating " + path);
 		return new File(path).createNewFile();
 	}
 
 	public static boolean controlFileExists(String name) {
-		String path = TEMP_DIR + File.separator + name;
+		String path = getControlFilePath(name);
 		return new File(path).exists();
 	}
+	
+	private static String getControlFilePath(String name) {
+		return TEMP_DIR.endsWith(File.separator)? TEMP_DIR + name : TEMP_DIR + File.separator + name;
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/springframework/data/gemfire/config/DynamicRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/DynamicRegionNamespaceTest.java
index 9eee572c..a42ec237 100644
--- a/src/test/java/org/springframework/data/gemfire/config/DynamicRegionNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/DynamicRegionNamespaceTest.java
@@ -21,6 +21,8 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.File;
+
 import org.junit.Test;
 import org.springframework.data.gemfire.RecreatingContextTest;
 
@@ -47,6 +49,6 @@ public class DynamicRegionNamespaceTest extends RecreatingContextTest {
 		DynamicRegionFactory.Config config = drf.getConfig();
 		assertFalse(config.persistBackup);
 		assertFalse(config.registerInterest);
-		assertEquals("/foo", config.diskDir.getAbsolutePath());
+		assertEquals(File.separator + "foo", config.diskDir.getPath());
 	}
 }
\ No newline at end of file