From 2fa238323a57c5278931e486ec70f231289dbf3e Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski@gmail.com>
Date: Mon, 25 Jun 2012 10:02:01 -0400
Subject: [PATCH] for 1.1.2.RELEASE, upgraded to Gemfire 6.6.3, SGF-85,SGF-99

---
 docs/src/info/changelog.txt                   | 10 +++++++
 gradle.properties                             |  4 +--
 ...DiskStoreAndEvictionRegionParsingTest.java | 26 +++++++++++++++++--
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/docs/src/info/changelog.txt b/docs/src/info/changelog.txt
index 21560869..10e13dc8 100644
--- a/docs/src/info/changelog.txt
+++ b/docs/src/info/changelog.txt
@@ -2,6 +2,16 @@ SPRING DATA GEMFIRE CHANGELOG
 =============================
 http://www.springsource.org/spring-gemfire
 
+Changes in version 1.1.2.RELEASE (2012-07-25)
+---------------------------------------------
+
+General
+* Upgraded to GemFire 6.6.3
+
+Package org.springframework.data.gemfire.config
+* Fixed incorrect parsing of pdx-disk-store attribute
+* Fixed a bug in DiskStoreAndEvictionRegionParsingTest that caused the test to fail if a temporary directory does not exist
+
 Changes in version 1.1.1.RELEASE (2012-03-20)
 ---------------------------------------------
 
diff --git a/gradle.properties b/gradle.properties
index 65ad68d6..53aa708b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ slf4jVersion = 1.6.4
 
 # Common libraries
 springVersion = 3.1.1.RELEASE
-gemfireVersion = 6.6.2
+gemfireVersion = 6.6.3
 
 # Testing
 junitVersion = 4.8.1
@@ -21,4 +21,4 @@ gemfire.range = "[6.5, 7.0)"
 # --------------------
 # Project wide version
 # --------------------
-springGemfireVersion=1.1.2.BUILD-SNAPSHOT
\ No newline at end of file
+springGemfireVersion=1.1.2.RELEASE
\ No newline at end of file
diff --git a/src/test/java/org/springframework/data/gemfire/config/DiskStoreAndEvictionRegionParsingTest.java b/src/test/java/org/springframework/data/gemfire/config/DiskStoreAndEvictionRegionParsingTest.java
index c4e0bec8..8b7cf0b6 100644
--- a/src/test/java/org/springframework/data/gemfire/config/DiskStoreAndEvictionRegionParsingTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/DiskStoreAndEvictionRegionParsingTest.java
@@ -22,6 +22,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +54,25 @@ public class DiskStoreAndEvictionRegionParsingTest {
 	@Autowired
 	private ApplicationContext context;
 
+	private static File diskStoreDir;
+
+	@BeforeClass
+	public static void setUp() {
+		String path = "./build/tmp";
+		diskStoreDir = new File(path);
+		if (!diskStoreDir.exists()) {
+			diskStoreDir.mkdir();
+		}
+	}
+
+	@AfterClass
+	public static void tearDown() {
+		for (File file : diskStoreDir.listFiles()) {
+			file.delete();
+		}
+		diskStoreDir.delete();
+	}
+
 	@Test
 	public void testReplicaDataOptions() throws Exception {
 		assertTrue(context.containsBean("replicated-data"));
@@ -82,8 +103,9 @@ public class DiskStoreAndEvictionRegionParsingTest {
 		EvictionAttributes evicAttr = attrs.getEvictionAttributes();
 		assertEquals(EvictionAction.LOCAL_DESTROY, evicAttr.getAction());
 		assertEquals(EvictionAlgorithm.LRU_MEMORY, evicAttr.getAlgorithm());
-		// for some reason GemFire resets this to 56 on my machine (not sure why)
-		//assertEquals(10, evicAttr.getMaximum());
+		// for some reason GemFire resets this to 56 on my machine (not sure
+		// why)
+		// assertEquals(10, evicAttr.getMaximum());
 		ObjectSizer sizer = evicAttr.getObjectSizer();
 		assertEquals(SimpleObjectSizer.class, sizer.getClass());
 	}