Refactored region factories

docs/src/info/changelog.txt

@@ -2,12 +2,14 @@ SPRING DATA GEMFIRE CHANGELOG
 =============================
 http://www.springsource.org/spring-gemfire
 
-Changes in version 1.2.0.M1 (2012-03-20)
-----------------------------------------
+Changes in version 1.1.2.RELEASE (2012-07-04)
+---------------------------------------------
 
 General
-* Introduced support for annotation-based entity mapping (@Id, @PersistenceConstructor, @Id)
-* Introduced support for Spring Data Repositories (query exception & derivation)
+* Upgraded to GemFire 6.6.3
+
+Package org.springframework.data.gemfire.config
+* Fixed incorrect parsing of pdx-disk-store attribute
 
 
 Changes in version 1.1.1.RELEASE (2012-03-20)

gradle.properties

@@ -7,7 +7,7 @@ slf4jVersion = 1.6.4
 # Common libraries
 springVersion = 3.1.1.RELEASE
 springDataCommonsVersion = 1.3.0.BUILD-SNAPSHOT
-gemfireVersion = 6.6.2
+gemfireVersion = 6.6.3
 
 # Testing
 junitVersion = 4.8.1
@@ -23,4 +23,4 @@ gemfire.range = "[6.5, 7.0)"
 # --------------------
 # Project wide version
 # --------------------
-springGemfireVersion=1.1.1.BUILD-SNAPSHOT
+springGemfireVersion=1.2.0.BUILD-SNAPSHOT

src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.gemfire;
+
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.RegionFactory;
+
+/**
+ * @author David Turanski
+ * 
+ */
+public class LocalRegionFactoryBean<K, V> extends RegionFactoryBean<K, V> {
+
+	@Override
+	protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, boolean persistent, String dataPolicyName) {
+		if (dataPolicyName != null) {
+			if ("NORMAL".equals(dataPolicyName) || dataPolicyName == null) {
+				regionFactory.setDataPolicy(DataPolicy.NORMAL);
+			}
+			else if ("PRELOADED".equals(dataPolicyName)) {
+				regionFactory.setDataPolicy(DataPolicy.PRELOADED);
+			}
+			else if ("EMPTY".equals(dataPolicyName)) {
+				regionFactory.setDataPolicy(DataPolicy.EMPTY);
+			}
+			else {
+				throw new IllegalArgumentException("Data policy '" + dataPolicyName
+						+ "' is unsupported or invalid for local regions.");
+			}
+		}
+	}
+
+}

src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.gemfire;
+
+import java.util.concurrent.ConcurrentMap;
+
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionFactory;
+
+/**
+ * @author David Turanski
+ * 
+ */
+public class PartitionedRegionFactoryBean<K, V> extends RegionFactoryBean<K, V> {
+
+	@Override
+	protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, boolean persistent, String dataPolicyName) {
+		if (persistent) {
+			// check first for GemFire 6.5
+			if (ConcurrentMap.class.isAssignableFrom(Region.class)) {
+				regionFactory.setDataPolicy(DataPolicy.PERSISTENT_PARTITION);
+			}
+			else {
+				throw new IllegalArgumentException(
+						"Can define persistent partitions only from GemFire 6.5 onwards - current version is ["
+								+ CacheFactory.getVersion() + "]");
+			}
+		}
+		else {
+			regionFactory.setDataPolicy(DataPolicy.PARTITION);
+		}
+	}
+
+}

src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java

@@ -34,7 +34,6 @@ import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.CacheListener;
 import com.gemstone.gemfire.cache.CacheLoader;
 import com.gemstone.gemfire.cache.CacheWriter;
-import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.GemFireCache;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
@@ -54,7 +53,7 @@ import com.gemstone.gemfire.cache.Scope;
  * @author Costin Leau
  * @author David Turanski
  */
-public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> implements DisposableBean {
+public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> implements DisposableBean {
 
 	protected final Log log = LogFactory.getLog(getClass());
 
@@ -74,9 +73,9 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 
 	private Scope scope;
 
-	private String diskStoreName;
+	private boolean persistent;
 
-	private DataPolicy dataPolicy;
+	private String diskStoreName;
 
 	private String dataPolicyName;
 
@@ -117,23 +116,7 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 			regionFactory.setCacheWriter(cacheWriter);
 		}
 
-		if (dataPolicy != null) {
-			regionFactory.setDataPolicy(dataPolicy);
-		}
-
-		if (dataPolicyName != null) {
-			Assert.isNull(dataPolicy, "'dataPolicy' and 'dataPolicyName' are mutually exclusive.");
-			if ("NORMAL".equals(dataPolicyName)) {
-				regionFactory.setDataPolicy(DataPolicy.NORMAL);
-			}
-			else if ("PRELOADED".equals(dataPolicyName)) {
-				regionFactory.setDataPolicy(DataPolicy.PRELOADED);
-			}
-			else {
-				throw new IllegalArgumentException("Data policy '" + dataPolicyName + "' is unsupported or invalid.");
-			}
-
-		}
+		resolveDataPolicy(regionFactory, persistent, dataPolicyName);
 
 		if (scope != null) {
 			regionFactory.setScope(scope);
@@ -163,6 +146,9 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 		return reg;
 	}
 
+	protected abstract void resolveDataPolicy(RegionFactory<K, V> regionFactory, boolean persistent,
+			String dataPolicyName);
+
 	@SuppressWarnings("unchecked")
 	private AttributesFactory<K, V> findAttrFactory(RegionFactory<K, V> regionFactory) {
 		Field attrField = ReflectionUtils.findField(RegionFactory.class, "attrsFactory", AttributesFactory.class);
@@ -297,16 +283,6 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 		this.cacheWriter = cacheWriter;
 	}
 
-	/**
-	 * Sets the data policy. Used only when a new region is created. Overrides
-	 * the settings specified through {@link #setAttributes(RegionAttributes)}.
-	 * 
-	 * @param dataPolicy the region data policy
-	 */
-	public void setDataPolicy(DataPolicy dataPolicy) {
-		this.dataPolicy = dataPolicy;
-	}
-
 	/**
 	 * Sets the region scope. Used only when a new region is created. Overrides
 	 * the settings specified through {@link #setAttributes(RegionAttributes)}.
@@ -318,6 +294,10 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 		this.scope = scope;
 	}
 
+	public void setPersistent(boolean persistent) {
+		this.persistent = persistent;
+	}
+
 	/**
 	 * Sets the dataPolicy as a String. Required to support property
 	 * placeholders

src/main/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBean.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.gemfire;
+
+import org.springframework.util.Assert;
+
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.RegionFactory;
+
+/**
+ * @author David Turanski
+ * 
+ */
+public class ReplicatedRegionFactoryBean<K, V> extends RegionFactoryBean<K, V> {
+	@Override
+	protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, boolean persistent, String dataPolicyName) {
+
+		DataPolicy dataPolicy = null;
+		if (dataPolicyName != null) {
+			if ("EMPTY".equals(dataPolicyName)) {
+				Assert.isTrue(!persistent, "Cannot have persistence on an empty region");
+				dataPolicy = DataPolicy.EMPTY;
+			}
+			else {
+				throw new IllegalArgumentException("Data policy '" + dataPolicyName
+						+ "' is unsupported or invalid for replicated regions.");
+			}
+		}
+		else {
+			dataPolicy = persistent ? DataPolicy.PERSISTENT_REPLICATE : DataPolicy.REPLICATE;
+		}
+		regionFactory.setDataPolicy(dataPolicy);
+	}
+}

src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java

@@ -102,6 +102,11 @@ abstract class AbstractRegionParser extends AliasReplacingBeanDefinitionParser {
 		ParsingUtils.parseOptionalRegionAttributes(parserContext, element, attrBuilder);
 		ParsingUtils.parseStatistics(element, attrBuilder);
 		ParsingUtils.setPropertyValue(element, attrBuilder, "publisher");
+		if (!isSubRegion(element)) {
+			ParsingUtils.setPropertyValue(element, builder, "persistent");
+		}
+		// set the data policy
+		ParsingUtils.setPropertyValue(element, builder, "data-policy", "dataPolicyName");
 
 		if (StringUtils.hasText(element.getAttribute("disk-store-ref"))) {
 			ParsingUtils.setPropertyValue(element, builder, "disk-store-ref", "diskStoreName");

src/main/java/org/springframework/data/gemfire/config/AliasReplacingBeanDefinitionParser.java

@@ -21,7 +21,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.gemfire.RegionFactoryBean;
 import org.springframework.data.gemfire.SubRegionFactoryBean;
 import org.w3c.dom.Element;
 
@@ -43,10 +42,12 @@ abstract class AliasReplacingBeanDefinitionParser extends AbstractSingleBeanDefi
 			return SubRegionFactoryBean.class;
 		}
 		else {
-			return RegionFactoryBean.class;
+			return getRegionFactoryClass();
 		}
 	}
 
+	protected abstract Class<?> getRegionFactoryClass();
+
 	@Override
 	protected final void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
 

src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java

@@ -41,9 +41,8 @@ import com.gemstone.gemfire.cache.DataPolicy;
  * @author David Turanski
  */
 class ClientRegionParser extends AliasReplacingBeanDefinitionParser {
-
 	@Override
-	protected Class<?> getBeanClass(Element element) {
+	protected Class<?> getRegionFactoryClass() {
 		return ClientRegionFactoryBean.class;
 	}
 

src/main/java/org/springframework/data/gemfire/config/LocalRegionParser.java

@@ -18,11 +18,10 @@ package org.springframework.data.gemfire.config;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.gemfire.LocalRegionFactoryBean;
 import org.springframework.data.gemfire.RegionAttributesFactoryBean;
-import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
-import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.Scope;
 
 /**
@@ -36,15 +35,6 @@ class LocalRegionParser extends AbstractRegionParser {
 	protected void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
 			boolean subRegion) {
 
-		// set the data policy
-		String attr = element.getAttribute("data-policy");
-		if (StringUtils.hasText(attr)) {
-			builder.addPropertyValue("dataPolicyName", attr.toUpperCase());
-		}
-		else {
-			builder.addPropertyValue("dataPolicy", DataPolicy.NORMAL);
-		}
-
 		builder.addPropertyValue("scope", Scope.LOCAL);
 
 		BeanDefinitionBuilder attrBuilder = subRegion ? builder : BeanDefinitionBuilder
@@ -56,4 +46,9 @@ class LocalRegionParser extends AbstractRegionParser {
 		}
 	}
 
+	@Override
+	protected Class<?> getRegionFactoryClass() {
+		return LocalRegionFactoryBean.class;
+	}
+
 }

src/main/java/org/springframework/data/gemfire/config/LookupRegionParser.java

@@ -21,7 +21,6 @@ import java.util.List;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.gemfire.RegionLookupFactoryBean;
-import org.springframework.data.gemfire.SubRegionFactoryBean;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
@@ -34,16 +33,6 @@ import org.w3c.dom.Element;
  */
 class LookupRegionParser extends AbstractRegionParser {
 
-	@Override
-	protected Class<?> getBeanClass(Element element) {
-		if (isSubRegion(element)) {
-			return SubRegionFactoryBean.class;
-		}
-		else {
-			return RegionLookupFactoryBean.class;
-		}
-	}
-
 	@Override
 	protected void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
 			boolean subRegion) {
@@ -69,4 +58,9 @@ class LookupRegionParser extends AbstractRegionParser {
 			}
 		}
 	}
+
+	@Override
+	protected Class<?> getRegionFactoryClass() {
+		return RegionLookupFactoryBean.class;
+	}
 }

src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java

@@ -17,20 +17,16 @@
 package org.springframework.data.gemfire.config;
 
 import java.util.List;
-import java.util.concurrent.ConcurrentMap;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.gemfire.PartitionAttributesFactoryBean;
+import org.springframework.data.gemfire.PartitionedRegionFactoryBean;
 import org.springframework.data.gemfire.RegionAttributesFactoryBean;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.Region;
-
 /**
  * Parser for <partitioned-region;gt; definitions.
  * 
@@ -41,30 +37,16 @@ import com.gemstone.gemfire.cache.Region;
  * @author David Turanski
  */
 class PartitionedRegionParser extends AbstractRegionParser {
+	@Override
+	protected Class<?> getRegionFactoryClass() {
+		return PartitionedRegionFactoryBean.class;
+	}
 
 	@Override
 	protected void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
 			boolean subRegion) {
 		super.doParse(element, builder);
 
-		// set the data policy
-		String attr = element.getAttribute("persistent");
-
-		if (Boolean.parseBoolean(attr)) {
-			// check first for GemFire 6.5
-			if (ConcurrentMap.class.isAssignableFrom(Region.class)) {
-				builder.addPropertyValue("dataPolicy", "PERSISTENT_PARTITION");
-			}
-			else {
-				parserContext.getReaderContext().error(
-						"Can define persistent partitions only from GemFire 6.5 onwards - current version is ["
-								+ CacheFactory.getVersion() + "]", element);
-			}
-		}
-		else {
-			builder.addPropertyValue("dataPolicy", DataPolicy.PARTITION);
-		}
-
 		BeanDefinitionBuilder attrBuilder = subRegion ? builder : BeanDefinitionBuilder
 				.genericBeanDefinition(RegionAttributesFactoryBean.class);
 
@@ -74,7 +56,7 @@ class PartitionedRegionParser extends AbstractRegionParser {
 		BeanDefinitionBuilder parAttrBuilder = BeanDefinitionBuilder
 				.genericBeanDefinition(PartitionAttributesFactoryBean.class);
 
-		attr = element.getAttribute("colocated-with");
+		String attr = element.getAttribute("colocated-with");
 
 		if (StringUtils.hasText(attr)) {
 			parAttrBuilder.addPropertyValue("colocatedWith", attr);

src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java

@@ -19,10 +19,9 @@ package org.springframework.data.gemfire.config;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.gemfire.RegionAttributesFactoryBean;
+import org.springframework.data.gemfire.ReplicatedRegionFactoryBean;
 import org.w3c.dom.Element;
 
-import com.gemstone.gemfire.cache.DataPolicy;
-
 /**
  * Parser for <replicated-region;gt; definitions.
  * 
@@ -34,15 +33,6 @@ class ReplicatedRegionParser extends AbstractRegionParser {
 	protected void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
 			boolean subRegion) {
 
-		// set the data policy
-		String attr = element.getAttribute("persistent");
-		if (Boolean.parseBoolean(attr)) {
-			builder.addPropertyValue("dataPolicy", DataPolicy.PERSISTENT_REPLICATE);
-		}
-		else {
-			builder.addPropertyValue("dataPolicy", DataPolicy.REPLICATE);
-		}
-
 		ParsingUtils.parseScope(element, builder);
 
 		BeanDefinitionBuilder attrBuilder = subRegion ? builder : BeanDefinitionBuilder
@@ -53,4 +43,9 @@ class ReplicatedRegionParser extends AbstractRegionParser {
 			builder.addPropertyValue("attributes", attrBuilder.getBeanDefinition());
 		}
 	}
+
+	@Override
+	protected Class<?> getRegionFactoryClass() {
+		return ReplicatedRegionFactoryBean.class;
+	}
 }

src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd

@@ -781,6 +781,7 @@ Provides an estimate of the maximum number of application threads that will conc
 					</xsd:annotation>
 				</xsd:attribute>
 				<xsd:attribute name="scope" type="scopeType"/>
+                <xsd:attribute name="data-policy" type="baseDataPolicyType"/>
 				<xsd:attribute name="is-lock-grantor" type="xsd:string" use="optional" default="false">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
@@ -1858,7 +1859,6 @@ Specifies a data type if other than java.lang.String
 		<xsd:restriction base="xsd:string">
 			<xsd:enumeration value="NORMAL"/>
 			<xsd:enumeration value="EMPTY"/>
-			<xsd:enumeration value="NORMAL"/>
 			<xsd:enumeration value="PRELOADED"/>
 		</xsd:restriction>
 	</xsd:simpleType>

src/test/java/org/springframework/data/gemfire/SubRegionTest.java

@@ -27,52 +27,54 @@ import com.gemstone.gemfire.cache.Region;
 /**
  * 
  * @author David Turanski
- *
+ * 
  */
 public class SubRegionTest extends RecreatingContextTest {
 	@Override
 	protected String location() {
-		return  "org/springframework/data/gemfire/basic-subregion.xml";
+		return "org/springframework/data/gemfire/basic-subregion.xml";
 	}
+
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Test 
+	@Test
 	public void testBasic() throws Exception {
 		CacheFactoryBean cfb = new CacheFactoryBean();
 		cfb.setUseBeanFactoryLocator(false);
 		cfb.afterPropertiesSet();
 		GemFireCache cache = cfb.getObject();
-		RegionFactoryBean rfb = new RegionFactoryBean();
+		RegionFactoryBean rfb = new ReplicatedRegionFactoryBean();
 		rfb.setCache(cache);
 		rfb.setName("parent");
 		rfb.afterPropertiesSet();
 		Region parent = rfb.getObject();
-		
+
 		SubRegionFactoryBean srfb = new SubRegionFactoryBean();
 		srfb.setParent(parent);
 		srfb.setName("/parent/child");
 		srfb.setRegionName("child");
 		srfb.afterPropertiesSet();
 		Region child = srfb.getObject();
-		
+
 		assertNotNull(parent.getSubregion("child"));
-		assertSame(child,parent.getSubregion("child"));
-		
+		assertSame(child, parent.getSubregion("child"));
+
 		cache.close();
 	}
+
 	@SuppressWarnings("rawtypes")
-	@Test 
+	@Test
 	public void testContext() throws Exception {
 		Region parent = ctx.getBean("parent", Region.class);
 		Region child = ctx.getBean("/parent/child", Region.class);
 		assertNotNull(parent.getSubregion("child"));
-		assertSame(child,parent.getSubregion("child"));
-		assertEquals("/parent/child",child.getFullPath());
+		assertSame(child, parent.getSubregion("child"));
+		assertEquals("/parent/child", child.getFullPath());
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	@Test 
+	@Test
 	public void testChildOnly() throws Exception {
 		Region child = ctx.getBean("/parent/child", Region.class);
-		assertEquals("/parent/child",child.getFullPath());
+		assertEquals("/parent/child", child.getFullPath());
 	}
 }

src/test/java/org/springframework/data/gemfire/config/DiskStoreAndEvictionRegionParsingTest.java

@@ -29,14 +29,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.data.gemfire.PartitionedRegionFactoryBean;
 import org.springframework.data.gemfire.RegionFactoryBean;
+import org.springframework.data.gemfire.ReplicatedRegionFactoryBean;
 import org.springframework.data.gemfire.SimpleObjectSizer;
 import org.springframework.data.gemfire.TestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.DiskStore;
 import com.gemstone.gemfire.cache.DiskStoreFactory;
 import com.gemstone.gemfire.cache.EvictionAction;
@@ -98,7 +99,7 @@ public class DiskStoreAndEvictionRegionParsingTest {
 	public void testReplicaDataOptions() throws Exception {
 		assertTrue(context.containsBean("replicated-data"));
 		RegionFactoryBean fb = context.getBean("&replicated-data", RegionFactoryBean.class);
-		assertEquals(DataPolicy.REPLICATE, TestUtils.readField("dataPolicy", fb));
+		assertTrue(fb instanceof ReplicatedRegionFactoryBean);
 		assertEquals(Scope.DISTRIBUTED_ACK, TestUtils.readField("scope", fb));
 		Region region = context.getBean("replicated-data", Region.class);
 		// eviction tests
@@ -114,8 +115,10 @@ public class DiskStoreAndEvictionRegionParsingTest {
 	public void testPartitionDataOptions() throws Exception {
 		assertTrue(context.containsBean("partition-data"));
 		RegionFactoryBean fb = context.getBean("&partition-data", RegionFactoryBean.class);
-		assertEquals(DataPolicy.PERSISTENT_PARTITION, TestUtils.readField("dataPolicy", fb));
+		assertTrue(fb instanceof PartitionedRegionFactoryBean);
+		assertTrue((Boolean) TestUtils.readField("persistent", fb));
 		RegionAttributes attrs = TestUtils.readField("attributes", fb);
+
 		EvictionAttributes evicAttr = attrs.getEvictionAttributes();
 		assertEquals(EvictionAction.LOCAL_DESTROY, evicAttr.getAction());
 		assertEquals(EvictionAlgorithm.LRU_MEMORY, evicAttr.getAlgorithm());

src/test/java/org/springframework/data/gemfire/config/PartitionedRegionNamespaceTest.java

@@ -25,6 +25,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.data.gemfire.PartitionedRegionFactoryBean;
 import org.springframework.data.gemfire.RegionFactoryBean;
 import org.springframework.data.gemfire.SimplePartitionResolver;
 import org.springframework.data.gemfire.TestUtils;
@@ -33,7 +34,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.ObjectUtils;
 
 import com.gemstone.gemfire.cache.CacheListener;
-import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.PartitionAttributes;
 import com.gemstone.gemfire.cache.RegionAttributes;
 
@@ -56,7 +56,7 @@ public class PartitionedRegionNamespaceTest {
 	public void testPartitionOptions() throws Exception {
 		assertTrue(context.containsBean("options"));
 		RegionFactoryBean fb = context.getBean("&options", RegionFactoryBean.class);
-		assertEquals(DataPolicy.PARTITION, TestUtils.readField("dataPolicy", fb));
+		assertTrue(fb instanceof PartitionedRegionFactoryBean);
 		assertEquals(null, TestUtils.readField("scope", fb));
 		assertEquals("redundant", TestUtils.readField("name", fb));
 

src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.gemfire.RegionFactoryBean;
 import org.springframework.data.gemfire.RegionLookupFactoryBean;
+import org.springframework.data.gemfire.ReplicatedRegionFactoryBean;
 import org.springframework.data.gemfire.TestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -34,7 +35,6 @@ import org.springframework.util.ObjectUtils;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheListener;
-import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.Scope;
@@ -58,7 +58,7 @@ public class ReplicatedRegionNamespaceTest {
 	public void testPublishingReplica() throws Exception {
 		assertTrue(context.containsBean("pub"));
 		RegionFactoryBean fb = context.getBean("&pub", RegionFactoryBean.class);
-		assertEquals(DataPolicy.REPLICATE, TestUtils.readField("dataPolicy", fb));
+		assertTrue(fb instanceof ReplicatedRegionFactoryBean);
 		assertEquals(Scope.DISTRIBUTED_ACK, TestUtils.readField("scope", fb));
 		assertEquals("publisher", TestUtils.readField("name", fb));
 		RegionAttributes attrs = TestUtils.readField("attributes", fb);

src/test/resources/org/springframework/data/gemfire/basic-tx-config.xml

@@ -8,7 +8,7 @@
 	
 	<bean id="transactionManager" class="org.springframework.data.gemfire.GemfireTransactionManager" p:cache-ref="cache"/>
 	
-	<bean id="rollback-region" class="org.springframework.data.gemfire.RegionFactoryBean" p:name="r-region" p:cache-ref="cache"/>
-	<bean id="commit-region" class="org.springframework.data.gemfire.RegionFactoryBean" p:name="c-region" p:cache-ref="cache"/>
+	<bean id="rollback-region" class="org.springframework.data.gemfire.LocalRegionFactoryBean" p:name="r-region" p:cache-ref="cache"/>
+	<bean id="commit-region" class="org.springframework.data.gemfire.LocalRegionFactoryBean" p:name="c-region" p:cache-ref="cache"/>
 	
 </beans>

src/test/resources/org/springframework/data/gemfire/client/basic-region.xml

@@ -14,12 +14,12 @@
 		</property>
 	</bean>
 	
-	<bean id="basic" class="org.springframework.data.gemfire.RegionFactoryBean" p:cache-ref="cache" p:name="basic"/>
+	<bean id="basic" class="org.springframework.data.gemfire.LocalRegionFactoryBean" p:cache-ref="cache" p:name="basic"/>
 	
 	<!-- find existing region -->
-	<bean id="root" class="org.springframework.data.gemfire.RegionFactoryBean" p:cache-ref="cache"/>
+	<bean id="root" class="org.springframework.data.gemfire.LocalRegionFactoryBean" p:cache-ref="cache"/>
 	
-	<bean id="listeners" class="org.springframework.data.gemfire.RegionFactoryBean" p:cache-ref="cache" p:name="listeners">
+	<bean id="listeners" class="org.springframework.data.gemfire.LocalRegionFactoryBean" p:cache-ref="cache" p:name="listeners">
 		<property name="cacheListeners">
 			<array>
 				<bean class="org.springframework.data.gemfire.client.RegionIntegrationTest$CacheList"/>
@@ -48,7 +48,7 @@
 	</bean>
 	
 	<!-- region with various attributes -->
-	<bean id="attr-region" class="org.springframework.data.gemfire.RegionFactoryBean" p:cache-ref="cache" lazy-init="true">
+	<bean id="attr-region" class="org.springframework.data.gemfire.PartitionedRegionFactoryBean" p:cache-ref="cache" lazy-init="true">
 		<property name="attributes">
 			<bean class="org.springframework.data.gemfire.RegionAttributesFactoryBean" p:initial-capacity="1024">
 				<property name="partitionAttributes">