From a7a771b11054b7b75025cf35f43185a888b629df Mon Sep 17 00:00:00 2001
From: costin <cleau@vmware.com>
Date: Wed, 15 Sep 2010 14:35:33 +0300
Subject: [PATCH] SGF-10 SGF-17 + integration test config + minor bug fix

---
 .../config/EvictionAttributesFactoryBean.java    |  6 +++---
 .../data/gemfire/config/diskstore-ns.xml         | 16 ++++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springframework/data/gemfire/config/EvictionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/config/EvictionAttributesFactoryBean.java
index d22bb594..ebdb1801 100644
--- a/src/main/java/org/springframework/data/gemfire/config/EvictionAttributesFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/config/EvictionAttributesFactoryBean.java
@@ -62,7 +62,7 @@ class EvictionAttributesFactoryBean implements FactoryBean<EvictionAttributes>,
 			if (threshold != null) {
 				return EvictionAttributes.createLRUEntryAttributes(threshold, action);
 			}
-			return EvictionAttributes.createLRUMemoryAttributes(threshold);
+			return EvictionAttributes.createLRUEntryAttributes();
 		}
 	}
 
@@ -81,14 +81,14 @@ class EvictionAttributesFactoryBean implements FactoryBean<EvictionAttributes>,
 	/**
 	 * @return the threshold
 	 */
-	public int getThreshold() {
+	public Integer getThreshold() {
 		return threshold;
 	}
 
 	/**
 	 * @param threshold the threshold to set
 	 */
-	public void setThreshold(int threshold) {
+	public void setThreshold(Integer threshold) {
 		this.threshold = threshold;
 	}
 
diff --git a/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml
index 18686c17..67974973 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml
@@ -11,16 +11,20 @@
 	<gfe:cache />
 	
 	<gfe:replicated-region id="replicated-data" persistent="true">
-		<!-- 
-		<gfe:eviction type="entry-count" threshold="50" action="overflow-to-disk"/>
- 		-->
+		<gfe:disk-store queue-size="50" auto-compact="true" max-oplog-size="10" synchronous-write="false" time-interval="9999">
+			<gfe:disk-dir location="./" max-size="1"/>
+		</gfe:disk-store>
+
+		<gfe:eviction type="ENTRY_COUNT" threshold="50" />
+	</gfe:replicated-region>
+ 	
+ 	
+	<gfe:partitioned-region id="partition-data" persistent="false">
 		<gfe:disk-store queue-size="50" auto-compact="true" max-oplog-size="10" synchronous-write="false" time-interval="9999">
 			<gfe:disk-dir location="./" max-size="1"/>
 		</gfe:disk-store> 
-	</gfe:replicated-region>
 
-	<gfe:partitioned-region id="partition-data" persistent="false">
-		<gfe:eviction type="memory" threshold="50" action="local-destroy"/>
+		<gfe:eviction type="MEMORY_SIZE" threshold="10" action="LOCAL_DESTROY"/>
 	</gfe:partitioned-region>
 	
 </beans>
\ No newline at end of file