diff --git a/src/main/java/org/springframework/data/gemfire/SubRegion.java b/src/main/java/org/springframework/data/gemfire/SubRegion.java
deleted file mode 100644
index dbb1b68b..00000000
--- a/src/main/java/org/springframework/data/gemfire/SubRegion.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.springframework.data.gemfire;
-
-import java.util.List;
-
-import com.gemstone.gemfire.cache.RegionAttributes;
-/**
- * 
- * @author David Turanski
- *
- * @param <K>
- * @param <V>
- */
-public class SubRegion<K, V> {
-	private final RegionAttributes<K, V> regionAttributes;
-	private final String regionName;
-	private List<SubRegion<?,?>> subRegions;
-	
-	public SubRegion(String regionName, RegionAttributes<K, V> regionAttributes) {
-		this.regionAttributes = regionAttributes;
-		this.regionName = regionName;
-	}
-	
-	public RegionAttributes<K, V> getRegionAttributes() {
-		return regionAttributes;
-	}
-	 
-	public String getRegionName() {
-		return regionName;
-	}
-	
-	public List<SubRegion<?, ?>> getSubRegions() {
-		return subRegions;
-	}
-	public void setSubRegions(List<SubRegion<?, ?>> subRegions) {
-		this.subRegions = subRegions;
-	} 
-}
diff --git a/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java
index 5c1104dc..dd033209 100644
--- a/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/SubRegionFactoryBean.java
@@ -1,42 +1,79 @@
+/*
+ * 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.List;
-
-import org.springframework.beans.factory.BeanNameAware;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
 
 import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Region;
 
-public class SubRegionFactoryBean<K,V> extends AttributesFactory<K,V> implements FactoryBean<SubRegion<K, V>>, InitializingBean {
+@SuppressWarnings("deprecation")
+/**
+ * FactoryBean for creating a Gemfire Region as a subregion
+ * @author David Turanski
+ *
+ * @param <K> - Region Key Type
+ * @param <V> - Region Value Type
+ */
+public class SubRegionFactoryBean<K, V> extends AttributesFactory<K, V> implements FactoryBean<Region<K, V>>,
+		InitializingBean {
+
+	protected final Log log = LogFactory.getLog(getClass());
+
+	@SuppressWarnings("unused")
 	private String name;
-	private SubRegion<K,V> subRegion;
+
 	private String regionName;
-	private List<SubRegion<?,?>> subRegions;
 
-	
-	public void setName(String name) {
-		this.name = name;
-	}
+	private Region<K, V> subRegion;
 
-	public void setSubRegions(List<SubRegion<?, ?>> subRegions) {
-		this.subRegions = subRegions;
+	private Region<?, ?> parent;
+
+	private boolean lookupOnly;
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(parent, "parent region must not be null");
+
+		this.subRegion = parent.getSubregion(regionName);
+		if (this.subRegion == null) {
+			if (lookupOnly) {
+				throw new BeanInitializationException("Cannot find region [" + regionName + "] in cache "
+						+ parent.getRegionService());
+			}
+			else {
+				log.debug("creating subregion of [" + parent.getFullPath() + "] with name " + regionName);
+				this.subRegion = this.parent.createSubregion(regionName, create());
+			}
+		}
 	}
 
 	@Override
-	public void afterPropertiesSet() throws Exception {	
-		this.subRegion = new SubRegion<K,V>(name,create());
-		this.subRegion.setSubRegions(this.subRegions);
-	}
-
-	@Override
-	public SubRegion<K, V> getObject() throws Exception {
+	public Region<K, V> getObject() throws Exception {
 		return this.subRegion;
 	}
 
 	@Override
 	public Class<?> getObjectType() {
-		return SubRegion.class;
+		return Region.class;
 	}
 
 	@Override
@@ -44,4 +81,37 @@ public class SubRegionFactoryBean<K,V> extends AttributesFactory<K,V> implements
 		return true;
 	}
 
+	/**
+	 * Set the bean name - the same as the subregion full path
+	 * @param name
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Set the simple name of the region
+	 * @param regionName
+	 */
+	public void setRegionName(String regionName) {
+		this.regionName = regionName;
+	}
+
+	/**
+	 * Set the parent Region
+	 * @param parent
+	 */
+	public void setParent(Region<?, ?> parent) {
+		this.parent = parent;
+	}
+
+	/**
+	 * Set to true if the subregion should already exist, e.g., specified by
+	 * &lt;lookup-region&gt;
+	 * @param lookupOnly
+	 */
+	public void setLookupOnly(boolean lookupOnly) {
+		this.lookupOnly = lookupOnly;
+	}
+
 }
diff --git a/src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java
new file mode 100644
index 00000000..55930f14
--- /dev/null
+++ b/src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 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.config;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.gemfire.RegionFactoryBean;
+import org.springframework.data.gemfire.SubRegionFactoryBean;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Element;
+
+/**
+ * Base class for all Region Parsers
+ * 
+ * @author David Turanski
+ */
+abstract class AbstractRegionParser extends AliasReplacingBeanDefinitionParser {
+	protected final Log log = LogFactory.getLog(getClass());
+	
+	protected Class<?> getBeanClass(Element element) {
+		if (element.hasAttribute("subregion")) {
+			return SubRegionFactoryBean.class;
+		}
+		else {
+			return RegionFactoryBean.class;
+		}
+	}
+
+	@Override
+	protected void doParseInternal(Element element, ParserContext parserContext, BeanDefinitionBuilder builder){
+		super.doParse(element, builder);
+		boolean subRegion = element.hasAttribute("subregion");
+		
+		doParseRegion(element, parserContext, builder, subRegion);
+		
+		if (subRegion) {
+			builder.addPropertyValue("parent", parserContext.getContainingBeanDefinition().getAttribute("parent")); 
+			builder.addPropertyValue("regionName", element.getAttribute(NAME_ATTRIBUTE));
+		}
+	}
+	
+	protected abstract void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
+			boolean subRegion);
+
+	protected void doParseSubRegion(Element element, Element subElement, ParserContext parserContext,
+			BeanDefinitionBuilder builder, boolean subRegion) {
+ 
+		String regionPath = null;
+		String parentBeanName = null;
+		if (subRegion) {
+			parentBeanName = parserContext.getContainingBeanDefinition().getAttribute("regionPath").toString();
+		}
+		else {
+			parentBeanName = getRegionNameFromElement(element);
+		}
+		regionPath = StringUtils
+				.arrayToDelimitedString(
+						new String[] { parentBeanName, getRegionNameFromElement(subElement) }, "/");
+		if (!regionPath.startsWith("/")) {
+			regionPath = "/" + regionPath;
+		}
+
+		/*
+		 * The Region parser needs some context to handle recursion correctly 
+		 */
+		builder.getBeanDefinition().setAttribute("parent",
+				new BeanDefinitionHolder(builder.getBeanDefinition(), parentBeanName));
+		builder.getBeanDefinition().setAttribute("regionPath",regionPath);
+
+		// Make recursive call
+		BeanDefinition subRegionDef = this.parseSubRegion(subElement, parserContext, builder);
+		//TODO: Is there a better work-around?
+		/*
+		 * This setting prevents the BF from generating a name for this been
+		 */
+		subRegionDef.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+        
+		if (log.isDebugEnabled()) {
+			log.debug("registering subregion as " + regionPath);
+		}
+		this.registerBeanDefinition(new BeanDefinitionHolder(subRegionDef, regionPath), parserContext.getRegistry());
+	}
+
+	private BeanDefinition parseSubRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+        /*
+         * Easy way to mark this element as a subregion
+         */
+		element.setAttribute("subregion", "true");
+		BeanDefinition beanDefinition = parserContext.getDelegate().parseCustomElement(element,
+				builder.getBeanDefinition());
+		return beanDefinition;
+	}
+	
+	private String getRegionNameFromElement(Element element){
+		String name = element.getAttribute(NAME_ATTRIBUTE);
+		return StringUtils.hasText(name)? name: element.getAttribute(ID_ATTRIBUTE);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/org/springframework/data/gemfire/config/LookupRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/LookupRegionParser.java
index 8c4c925e..0c32d54b 100644
--- a/src/main/java/org/springframework/data/gemfire/config/LookupRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/LookupRegionParser.java
@@ -16,10 +16,14 @@
 
 package org.springframework.data.gemfire.config;
 
+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;
 
 /**
@@ -27,21 +31,41 @@ import org.w3c.dom.Element;
  * 
  * @author Costin Leau
  */
-class LookupRegionParser extends AliasReplacingBeanDefinitionParser {
+class LookupRegionParser extends AbstractRegionParser {
 
+	@Override
 	protected Class<?> getBeanClass(Element element) {
-		return RegionLookupFactoryBean.class;
+		if (element.hasAttribute("subregion")) {
+			return SubRegionFactoryBean.class;
+		}
+		else {
+			return RegionLookupFactoryBean.class;
+		}
 	}
 
 	@Override
-	protected void doParseInternal(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+	protected void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
+			boolean subRegion) {
 		super.doParse(element, builder);
 
 		ParsingUtils.setPropertyValue(element, builder, "name", "name");
 
-		String attr = element.getAttribute("cache-ref");
-		// add cache reference (fallback to default if nothing is specified)
-		builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
+		if (!subRegion) {
+			String attr = element.getAttribute("cache-ref");
+			// add cache reference (fallback to default if nothing is specified)
+			builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
+		}
+		else {
+			builder.addPropertyValue("lookupOnly", true);
+		}
 
+		// parse nested elements
+		List<Element> subElements = DomUtils.getChildElements(element);
+		for (Element subElement : subElements) {
+			String name = subElement.getLocalName();
+			if (name.endsWith("region")) {
+				doParseSubRegion(element, subElement, parserContext, builder, subRegion);
+			}
+		}
 	}
 }
diff --git a/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java
index 5d046db3..aec50710 100644
--- a/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java
@@ -23,7 +23,6 @@ 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.RegionAttributesFactoryBean;
-import org.springframework.data.gemfire.RegionFactoryBean;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
@@ -35,18 +34,17 @@ import com.gemstone.gemfire.cache.Region;
 /**
  * Parser for &lt;partitioned-region;gt; definitions.
  * 
- * To avoid eager evaluations, the region attributes are declared as a nested definition.
+ * To avoid eager evaluations, the region attributes are declared as a nested
+ * definition.
  * 
  * @author Costin Leau
+ * @author David Turanski
  */
-class PartitionedRegionParser extends AliasReplacingBeanDefinitionParser {
-
-	protected Class<?> getBeanClass(Element element) {
-		return RegionFactoryBean.class;
-	}
+class PartitionedRegionParser extends AbstractRegionParser {
 
 	@Override
-	protected void doParseInternal(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+	protected void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
+			boolean subRegion) {
 		super.doParse(element, builder);
 
 		// set the data policy
@@ -67,23 +65,24 @@ class PartitionedRegionParser extends AliasReplacingBeanDefinitionParser {
 			builder.addPropertyValue("dataPolicy", DataPolicy.PARTITION);
 		}
 
+		BeanDefinitionBuilder attrBuilder = builder;
+
+		if (!subRegion) {
+			attr = element.getAttribute("cache-ref");
+			// add cache reference (fallback to default if nothing is specified)
+			builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
+			attrBuilder = BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactoryBean.class);
+		}
 		ParsingUtils.setPropertyValue(element, builder, "name", "name");
 
-		attr = element.getAttribute("cache-ref");
-		// add cache reference (fallback to default if nothing is specified)
-		builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
-
-		// region attributes
-		BeanDefinitionBuilder attrBuilder = BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactoryBean.class);
-
 		ParsingUtils.parseStatistics(element, attrBuilder);
 		ParsingUtils.parseExpiration(parserContext, element, attrBuilder);
 		ParsingUtils.parseEviction(parserContext, element, attrBuilder);
 		ParsingUtils.parseDiskStorage(element, attrBuilder);
 
 		// partition attributes
-		BeanDefinitionBuilder parAttrBuilder = BeanDefinitionBuilder.genericBeanDefinition(PartitionAttributesFactoryBean.class);
-
+		BeanDefinitionBuilder parAttrBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(PartitionAttributesFactoryBean.class);
 
 		attr = element.getAttribute("colocated-with");
 
@@ -122,7 +121,6 @@ class PartitionedRegionParser extends AliasReplacingBeanDefinitionParser {
 			parAttrBuilder.addPropertyValue("totalNumBuckets", Integer.valueOf(attr));
 		}
 
-
 		List<Element> subElements = DomUtils.getChildElements(element);
 
 		// parse nested cache-listener elements
@@ -142,15 +140,21 @@ class PartitionedRegionParser extends AliasReplacingBeanDefinitionParser {
 			}
 
 			else if ("partition-resolver".equals(name)) {
-				parAttrBuilder.addPropertyValue("partitionResolver", parsePartitionResolver(parserContext, subElement,
-						builder));
+				parAttrBuilder.addPropertyValue("partitionResolver",
+						parsePartitionResolver(parserContext, subElement, builder));
+			}
+			// subregion
+			else if (name.endsWith("region")) {
+				doParseSubRegion(element, subElement, parserContext, builder, subRegion);
 			}
 		}
 
 		// add partition attributes attributes
 		attrBuilder.addPropertyValue("partitionAttributes", parAttrBuilder.getBeanDefinition());
 		// add partition/overflow settings as attributes
-		builder.addPropertyValue("attributes", attrBuilder.getBeanDefinition());
+		if (!subRegion) {
+			builder.addPropertyValue("attributes", attrBuilder.getBeanDefinition());
+		}
 	}
 
 	private Object parseCacheListener(ParserContext parserContext, Element subElement, BeanDefinitionBuilder builder) {
diff --git a/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java
index d1e85e3d..830f85ea 100644
--- a/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * 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.
@@ -18,15 +18,9 @@ package org.springframework.data.gemfire.config;
 
 import java.util.List;
 
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.gemfire.RegionAttributesFactoryBean;
-import org.springframework.data.gemfire.SubRegion;
-import org.springframework.data.gemfire.SubRegionFactoryBean;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
@@ -38,18 +32,13 @@ import com.gemstone.gemfire.cache.Scope;
  * Parser for &lt;replicated-region;gt; definitions.
  * 
  * @author Costin Leau
+ * @author David Turanski
  */
-class ReplicatedRegionParser extends AliasReplacingBeanDefinitionParser {
-
-
+class ReplicatedRegionParser extends AbstractRegionParser {
 	@Override
-	protected void doParseInternal(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		super.doParse(element, builder);
-		System.out.println("building class " +
-		builder.getBeanDefinition().getBeanClassName());
+	protected void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
+			boolean subRegion) {
 
-		boolean subRegion = element.hasAttribute("subregion");
-	
 		// set the data policy
 		String attr = element.getAttribute("persistent");
 		if (Boolean.parseBoolean(attr)) {
@@ -64,8 +53,8 @@ class ReplicatedRegionParser extends AliasReplacingBeanDefinitionParser {
 		ParsingUtils.setPropertyValue(element, builder, "name", "name");
 
 		BeanDefinitionBuilder attrBuilder = builder;
-		
-		if (!subRegion){
+
+		if (!subRegion) {
 			attr = element.getAttribute("cache-ref");
 			// add cache reference (fallback to default if nothing is specified)
 			builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
@@ -84,13 +73,12 @@ class ReplicatedRegionParser extends AliasReplacingBeanDefinitionParser {
 		ParsingUtils.parseEviction(parserContext, element, attrBuilder);
 		ParsingUtils.parseDiskStorage(element, attrBuilder);
 
-		builder.addPropertyValue("attributes", attrBuilder.getBeanDefinition());
+		if (!subRegion) {
+			builder.addPropertyValue("attributes", attrBuilder.getBeanDefinition());
+		}
 
 		List<Element> subElements = DomUtils.getChildElements(element);
 
-		ManagedList subRegions = new ManagedList();
-		subRegions.setElementTypeName(SubRegionFactoryBean.class.getName());
-		 
 		// parse nested elements
 		for (Element subElement : subElements) {
 			String name = subElement.getLocalName();
@@ -106,23 +94,11 @@ class ReplicatedRegionParser extends AliasReplacingBeanDefinitionParser {
 			else if ("cache-writer".equals(name)) {
 				builder.addPropertyValue("cacheWriter", parseCacheWriter(parserContext, subElement, builder));
 			}
-			//subregion
-			else if (name.endsWith("region")){
-				System.out.println("element type:" + subElement.getSchemaTypeInfo().getTypeName());
-				String parentRegionName = StringUtils.hasLength(element.getAttribute(NAME_ATTRIBUTE))? element.getAttribute(NAME_ATTRIBUTE):
-					element.getAttribute(ID_ATTRIBUTE);
-				
-			
-				
-				BeanDefinition subRegionDef = this.parseSubRegion(subElement, parserContext, parentRegionName,builder.getBeanDefinition());
-				subRegions.add(subRegionDef);
-				System.out.println("parsed subregion " + subRegionDef);
+			// subregion
+			else if (name.endsWith("region")) {
+				doParseSubRegion(element, subElement, parserContext, builder, subRegion);
 			}
 		}
-		
-		if (!CollectionUtils.isEmpty(subRegions)) {
-			builder.addPropertyValue("subRegions", subRegions);
-		}
 	}
 
 	private Object parseCacheListener(ParserContext parserContext, Element subElement, BeanDefinitionBuilder builder) {
@@ -137,10 +113,4 @@ class ReplicatedRegionParser extends AliasReplacingBeanDefinitionParser {
 		return ParsingUtils.parseRefOrNestedBeanDeclaration(parserContext, subElement, builder);
 	}
 
-	private BeanDefinition parseSubRegion(Element element, ParserContext parserContext, String parentRegionName,
-			BeanDefinition parentDefinition) {
-		element.setAttribute("subregion", "true");
-		BeanDefinition beanDefinition = parserContext.getDelegate().parseCustomElement(element, parentDefinition);
-		return beanDefinition;
-	}
 }
\ No newline at end of file
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd
index a7f4fd02..f301c186 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.2.xsd
@@ -1,75 +1,90 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/gemfire" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool" xmlns:repository="http://www.springframework.org/schema/data/repository" targetNamespace="http://www.springframework.org/schema/gemfire" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
-	<xsd:import namespace="http://www.springframework.org/schema/data/repository" schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
-	<!-- -->
-	<xsd:annotation>
-		<xsd:documentation><![CDATA[
+<xsd:schema xmlns="http://www.springframework.org/schema/gemfire"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
+    xmlns:tool="http://www.springframework.org/schema/tool"
+    xmlns:repository="http://www.springframework.org/schema/data/repository"
+    targetNamespace="http://www.springframework.org/schema/gemfire"
+    elementFormDefault="qualified" attributeFormDefault="unqualified"
+    version="1.2">
+    <xsd:import namespace="http://www.springframework.org/schema/beans" />
+    <xsd:import namespace="http://www.springframework.org/schema/tool" />
+    <xsd:import namespace="http://www.springframework.org/schema/data/repository"
+        schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd" />
+    <!-- -->
+    <xsd:annotation>
+        <xsd:documentation><![CDATA[
             Namespace support for the Spring GemFire project.
         ]]></xsd:documentation>
-	</xsd:annotation>
-	<!-- -->
-	<xsd:complexType name="cacheBaseType">
-		<xsd:attribute name="id" type="xsd:ID" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+    </xsd:annotation>
+    <!-- -->
+    <xsd:complexType name="cacheBaseType">
+        <xsd:attribute name="id" type="xsd:ID" use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The name of the cache definition (by default "gemfire-cache").]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="cache-xml-location" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation source="org.springframework.core.io.Resource"><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="cache-xml-location" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation
+                    source="org.springframework.core.io.Resource"><![CDATA[
 The location of the GemFire cache xml file, as a Spring resource location: a URL, a "classpath:" pseudo URL,
 or a relative file path.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="properties-ref" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation source="java.util.Properties"><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="properties-ref" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation source="java.util.Properties"><![CDATA[
 The bean name of a Java Properties object that will be used for property substitution. For loading properties
 consider using a dedicated utility such as the <util:*/> namespace and its 'properties' element.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="use-bean-factory-locator" type="xsd:string" use="optional" default="true">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="use-bean-factory-locator"
+            type="xsd:string" use="optional" default="true">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Indicates whether a bean factory locator is enabled (default) for this cache definition or not. The locator stores
 the enclosing bean factory reference to allow auto-wiring of Spring beans into GemFire managed classes. Usually disabled
 when the same cache is used in multiple application context/bean factories inside the same VM.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pdx-serializer" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pdx-serializer" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Sets the PDX serializer for the cache. If this serializer is set, it will be consulted to see if it can serialize any 
 domain classes which are added to the cache in portable data exchange format. 				
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pdx-disk-store" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pdx-disk-store" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Sets the name of the disk store to use for PDX meta data. When serializing objects in the PDX format, 
 the type definitions are persisted to disk. This setting controls which disk store is used for that persistence.
 If not set, the metadata will go in the default disk store. 
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pdx-persistent" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pdx-persistent" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Control whether the type metadata for PDX objects is persisted to disk. The default for this setting is true. 
 If you are using a WAN gateway, or persistent regions, you should leave this set to true.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pdx-read-serialized" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pdx-read-serialized" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Sets the object preference to PdxInstance type. When a cached object that was serialized as a PDX is read from the cache 
 a PdxInstance will be returned instead of the actual domain class. The PdxInstance is an interface that provides run time
 access to the fields of a PDX without deserializing the entire PDX. The PdxInstance implementation is a light weight wrapper
@@ -79,11 +94,12 @@ access PdxInstance instead of Java object.
 Note that a PdxInstance is only returned if a serialized PDX is found in the cache. If the cache contains a deserialized PDX, 
 then a domain class instance is returned instead of a PdxInstance. 				
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pdx-ignore-unread-fields" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pdx-ignore-unread-fields"
+            type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Controls whether pdx ignores fields that were unread during deserialization. The default is to preserve unread fields be
 including their data during serialization. But if you configure the cache to ignore unread fields then their data will be 
 lost during serialization.
@@ -91,183 +107,221 @@ lost during serialization.
 You should only set this attribute to true if you know this member will only be reading cache data. In this use case you 
 do not need to pay the cost of preserving the unread fields since you will never be reserializing pdx data. 				
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-	<!-- -->
-	<xsd:element name="cache">
-		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.gemfire.CacheFactoryBean"><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:element name="cache">
+        <xsd:annotation>
+            <xsd:documentation
+                source="org.springframework.data.gemfire.CacheFactoryBean"><![CDATA[
 Defines a GemFire Cache instance used for creating or retrieving 'regions'.
 			]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.Cache"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="cacheBaseType">
-					<xsd:sequence>
-						<xsd:element name="jndi-bindings" minOccurs="0" maxOccurs="1">
-							<xsd:complexType>
-								<xsd:sequence>
-									<xsd:element name="jndi-binding" type="jndiBindingType" minOccurs="1" maxOccurs="unbounded"/>
-								</xsd:sequence>
-							</xsd:complexType>
-						</xsd:element>
-					</xsd:sequence>
-					<xsd:attribute name="copy-on-read" type="xsd:string" use="optional" default="false">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports type="com.gemstone.gemfire.cache.Cache" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="cacheBaseType">
+                    <xsd:sequence>
+                        <xsd:element name="jndi-bindings"
+                            minOccurs="0" maxOccurs="1">
+                            <xsd:complexType>
+                                <xsd:sequence>
+                                    <xsd:element name="jndi-binding"
+                                        type="jndiBindingType"
+                                        minOccurs="1" maxOccurs="unbounded" />
+                                </xsd:sequence>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                    <xsd:attribute name="copy-on-read"
+                        type="xsd:string" use="optional" default="false">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 Controls whether entry value retrieval methods return direct references to the entry value objects in the cache (false) 
 or copies of the objects (true).           
                 ]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="lock-timeout" type="xsd:string" use="optional" default="60">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="lock-timeout"
+                        type="xsd:string" use="optional" default="60">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 The timeout, in seconds, for implicit object lock requests. This setting affects automatic locking only,
  and does not apply to manual locking. If a lock request does not return before the specified timeout period,
   it is cancelled and returns with a failure.
                   ]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="lock-lease" type="xsd:string" use="optional" default="120">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="lock-lease" type="xsd:string"
+                        use="optional" default="120">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 The timeout, in seconds, for implicit and explicit object lock leases. This affects both automatic locking and manual locking.
 Once a lock is obtained, it can remain in force for the lock lease time period before being automatically cleared by the system
                 ]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="message-sync-interval" type="xsd:string" use="optional" default="1">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="message-sync-interval"
+                        type="xsd:string" use="optional" default="1">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 Used for client subscription queue synchronization when this member acts as a server to clients and server redundancy is used.
 Sets the frequency (in seconds) at which the primary server sends messages to its secondary servers to remove queued events
 that have already been processed by the clients.
                 ]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="search-timeout" type="xsd:string" use="optional" default="300">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="search-timeout"
+                        type="xsd:string" use="optional" default="300">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 How many seconds a netSearch operation can wait for data before timing out.
 You may want to change this based on your knowledge of the network load or other factors.
                 ]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-	<!-- -->
-	<xsd:element name="client-cache">
-		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.gemfire.client.ClientCacheFactoryBean"><![CDATA[
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <!-- -->
+    <xsd:element name="client-cache">
+        <xsd:annotation>
+            <xsd:documentation
+                source="org.springframework.data.gemfire.client.ClientCacheFactoryBean"><![CDATA[
 Defines a GemFire Client Cache instance used for creating or retrieving 'regions'.
 			]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.client.ClientCache"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="cacheBaseType">
-					<xsd:attribute name="pool-name" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports
+                        type="com.gemstone.gemfire.cache.client.ClientCache" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="cacheBaseType">
+                    <xsd:attribute name="pool-name" type="xsd:string"
+                        use="optional">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 The name of the pool used by this client.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-	<!-- -->
-	<xsd:element name="transaction-manager">
-		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.gemfire.GemfireTransactionManager"><![CDATA[
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <!-- -->
+    <xsd:element name="transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation
+                source="org.springframework.data.gemfire.GemfireTransactionManager"><![CDATA[
 Defines a GemFire Transaction Manager instance for a single GemFire cache.
 			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:attribute name="id" type="xsd:ID" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The name of the transaction manager definition (by default "gemfire-transaction-manager").]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfire-cache">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="cache-ref" type="xsd:string"
+                use="optional" default="gemfire-cache">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The name of the bean defining the GemFire cache (by default 'gemfire-cache').
 					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="copy-on-read" type="xsd:string" use="optional" default="true">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="copy-on-read" type="xsd:string"
+                use="optional" default="true">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 Indicates whether the cache returns direct references or copies of the objects (default) it manages.
 While copies imply additional work for every fetch operation, direct references can cause dirty reads
 across concurrent threads in the same VM, whether or not transactions are used.
 					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-	<!-- nested bean definition -->
-	<xsd:complexType name="beanDeclarationType">
-		<xsd:sequence>
-			<xsd:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="1">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    <!-- nested bean definition -->
+    <xsd:complexType name="beanDeclarationType">
+        <xsd:sequence>
+            <xsd:any namespace="##other" processContents="skip"
+                minOccurs="0" maxOccurs="1">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 Inner bean definition. The nested declaration serves as an alternative to bean references (using 
 both in the same definition) is illegal.
 					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:any>
-		</xsd:sequence>
-		<xsd:attribute name="ref" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:any>
+        </xsd:sequence>
+        <xsd:attribute name="ref" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The name of the bean referred by this declaration. If no reference exists, use an inner bean declaration.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-	<!-- -->
-	<xsd:complexType name="basicRegionType">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.Region"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-	
-		<xsd:attribute name="name" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:complexType name="lookupSubRegionType">
+        <xsd:annotation>
+            <xsd:documentation><![CDATA[
+Defines a lookup Subregion
+                    ]]></xsd:documentation>
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports type="com.gemstone.gemfire.cache.Region" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="basicRegionType">
+                <xsd:group ref="subRegionGroup" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="basicRegionType">
+        <xsd:annotation>
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports type="com.gemstone.gemfire.cache.Region" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+
+        <xsd:attribute name="name" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The name of the region definition. If no specified, it will have the value of the id attribute (that is, the bean name).
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-	<!-- -->
-	<xsd:complexType name="readOnlySubRegionType" abstract="true">
-		<xsd:complexContent>
-			<xsd:extension base="basicRegionType">
-				<xsd:sequence>
-					<xsd:element name="cache-listener" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation source="com.gemstone.gemfire.cache.CacheListener"><![CDATA[
+                ]]></xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+
+    <!-- -->
+    <xsd:complexType name="readOnlySubRegionType"
+        abstract="true">
+        <xsd:complexContent>
+            <xsd:extension base="basicRegionType">
+                <xsd:sequence>
+                    <xsd:element name="cache-listener"
+                        minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation
+                                source="com.gemstone.gemfire.cache.CacheListener"><![CDATA[
 A cache listener definition for this region. A cache listener handles region or entry related events (that occur after
 various operations on the region). Multiple listeners can be declared in a nested manner.
 
@@ -275,43 +329,49 @@ Note: Avoid the risk of deadlock. Since the listener is invoked while holding a
 it is easy to generate a deadlock by interacting with the region. For this reason, it is highly recommended to use some
 other thread for accessing the region and not waiting for it to complete its task.
 							]]></xsd:documentation>
-							<xsd:appinfo>
-								<tool:annotation>
-									<tool:exports type="com.gemstone.gemfire.cache.CacheListener"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded">
-									<xsd:annotation>
-										<xsd:documentation><![CDATA[
+                            <xsd:appinfo>
+                                <tool:annotation>
+                                    <tool:exports
+                                        type="com.gemstone.gemfire.cache.CacheListener" />
+                                </tool:annotation>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:any namespace="##other"
+                                    processContents="skip" minOccurs="0"
+                                    maxOccurs="unbounded">
+                                    <xsd:annotation>
+                                        <xsd:documentation><![CDATA[
 Inner bean definition of the cache listener.
 										]]></xsd:documentation>
-									</xsd:annotation>
-								</xsd:any>
-							</xsd:sequence>
-							<xsd:attribute name="ref" type="xsd:string" use="optional">
-								<xsd:annotation>
-									<xsd:documentation><![CDATA[
+                                    </xsd:annotation>
+                                </xsd:any>
+                            </xsd:sequence>
+                            <xsd:attribute name="ref"
+                                type="xsd:string" use="optional">
+                                <xsd:annotation>
+                                    <xsd:documentation><![CDATA[
 The name of the cache listener bean referred by this declaration. Used as a convenience method. If no reference exists, 
 use inner bean declarations.
 									]]></xsd:documentation>
-								</xsd:annotation>
-							</xsd:attribute>
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="disk-store" type="diskStoreType" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                                </xsd:annotation>
+                            </xsd:attribute>
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="disk-store" type="diskStoreType"
+                        minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 Disk storage configuration for the defined region.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="persistent" type="xsd:string" default="false">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="persistent" type="xsd:string"
+                    default="false">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 Indicates whether the defined region is persistent or not. GemFire ensures that all the data you put into a region that
  is configured for persistence will be written to disk in a way that it can be recovered the next time you create the 
 region. This allows data to be recovered after a machine or process failure or after an orderly shutdown and restart 
@@ -321,11 +381,12 @@ Default is false, meaning the regions are not persisted.
 
 Note: Persistence for partitioned regions is supported only from GemFire 6.5 onwards.						
 						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="destroy" type="xsd:string" default="false">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="destroy" type="xsd:string"
+                    default="false">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 Indicates whether the defined region should be destroyed or not at shutdown. Destroy cascades to all entries and subregions.
 After the destroy, this region object can not be used any more and any attempt to use this region object will get 
 RegionDestroyedException.
@@ -334,11 +395,12 @@ Default is false, meaning that regions are not destroyed.
 
 Note: destroy and close are mutually exclusive. Enabling one will automatically disable the other.
 						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="close" type="xsd:string" default="true">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="close" type="xsd:string"
+                    default="true">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 Indicates whether the defined region should be closed or not at shutdown. Close performs a local destroy but leaves behind the region
 disk files. Additionally it notifies the listeners and callbacks.
 
@@ -347,290 +409,321 @@ Default is true, meaning the regions are closed.
 Note: Regions are automatically closed when cache closes.
 Note: destroy and close are mutually exclusive. Enabling one will automatically disable the other.				
 						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="statistics" type="xsd:string" default="false">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="statistics" type="xsd:string"
+                    default="false">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 Indicates whether statistics are enabled or disabled for this region and its entries.
 Default is false, meaning statistics are disabled.
 						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<!-- -->
-	<xsd:complexType name="readOnlyRegionType">
-		<xsd:complexContent>
-			<xsd:extension base="readOnlySubRegionType">
-				<xsd:attributeGroup ref="topLevelRegionAttributes"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<!-- -->
-	<xsd:complexType name="subRegionType">
-		<xsd:complexContent>
-			<xsd:extension base="readOnlySubRegionType">
-				<xsd:sequence minOccurs="0" maxOccurs="1">
-					<xsd:element name="cache-loader" type="beanDeclarationType" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation source="com.gemstone.gemfire.cache.CacheLoader"><![CDATA[
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:complexType name="readOnlyRegionType">
+        <xsd:complexContent>
+            <xsd:extension base="readOnlySubRegionType">
+                <xsd:attributeGroup ref="topLevelRegionAttributes" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:complexType name="subRegionType">
+        <xsd:complexContent>
+            <xsd:extension base="readOnlySubRegionType">
+                <xsd:sequence minOccurs="0" maxOccurs="1">
+                    <xsd:element name="cache-loader" type="beanDeclarationType"
+                        minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation
+                                source="com.gemstone.gemfire.cache.CacheLoader"><![CDATA[
 The cache loader definition for this region. A cache loader allows data to be placed into a region.
 							]]></xsd:documentation>
-							<xsd:appinfo>
-								<tool:annotation>
-									<tool:exports type="com.gemstone.gemfire.cache.CacheLoader"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="cache-writer" type="beanDeclarationType" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation source="com.gemstone.gemfire.cache.CacheWriter"><![CDATA[
+                            <xsd:appinfo>
+                                <tool:annotation>
+                                    <tool:exports
+                                        type="com.gemstone.gemfire.cache.CacheLoader" />
+                                </tool:annotation>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="cache-writer" type="beanDeclarationType"
+                        minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation
+                                source="com.gemstone.gemfire.cache.CacheWriter"><![CDATA[
 The cache writer definition for this region. A cache writer acts as a dedicated synchronous listener that is notified
 before a region or an entry is modified. A typical example would be a writer that updates the database.
 
 Note: Only one CacheWriter is invoked. GemFire will always prefer the local one (if it exists) otherwise it will
 arbitrarily pick one.
 							]]></xsd:documentation>
-							<xsd:appinfo>
-								<tool:annotation>
-									<tool:exports type="com.gemstone.gemfire.cache.CacheWriter"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="region-ttl" type="expirationType" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[[
+                            <xsd:appinfo>
+                                <tool:annotation>
+                                    <tool:exports
+                                        type="com.gemstone.gemfire.cache.CacheWriter" />
+                                </tool:annotation>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="region-ttl" type="expirationType"
+                        minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[[
 Time to live configuration for the region itself. Default: no expiration.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="region-tti" type="expirationType" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[[
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="region-tti" type="expirationType"
+                        minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[[
 Time to idle (or idle timeout) configuration for the region itself. Default: no expiration.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="entry-ttl" type="expirationType" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[[
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="entry-ttl" type="expirationType"
+                        minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[[
 Time to live configuration for the region entries. Default: no expiration.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="entry-tti" type="expirationType" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[[
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="entry-tti" type="expirationType"
+                        minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[[
 Time to idle (or idle timeout) configuration for the region entries. Default: no expiration.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<!-- -->
-	<xsd:complexType name="regionType">
-		<xsd:complexContent>
-			<xsd:extension base="subRegionType">
-				<xsd:group ref="subRegionGroup" minOccurs="0" maxOccurs="unbounded"/>
-				<xsd:attributeGroup ref="topLevelRegionAttributes"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<!-- -->
-	<xsd:complexType name="lookupRegionType">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[[
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:complexType name="regionType">
+        <xsd:complexContent>
+            <xsd:extension base="subRegionType">
+                <xsd:attributeGroup ref="topLevelRegionAttributes" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:complexType name="lookupRegionType">
+        <xsd:annotation>
+            <xsd:documentation><![CDATA[[
 Looks up an existing, working, GemFire region. Typically regions are defined through GemFire own configuration, the 
 cache.xml. If the region does not exist, an exception will be thrown.
 
 For defining regions, consider the region elements.
 			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="basicRegionType">
-				<xsd:group ref="subRegionGroup" minOccurs="0" maxOccurs="unbounded"/>
-				<xsd:attributeGroup ref="topLevelRegionAttributes"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<!-- -->
-	<xsd:group name="subRegionGroup">
-		<xsd:choice>
-			<xsd:element name="lookup-region" type="basicRegionType"/>
-			<xsd:element name="replicated-region" type="replicatedSubRegionType"/>
-			<xsd:element name="partitioned-region" type="partitionedSubRegionType"/>
-		</xsd:choice>
-	</xsd:group>
-	<!-- -->
-	<xsd:attributeGroup name="topLevelRegionAttributes">
-		<xsd:attribute name="id" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="basicRegionType">
+                <xsd:group ref="subRegionGroup" minOccurs="0"
+                    maxOccurs="unbounded" />
+                <xsd:attributeGroup ref="topLevelRegionAttributes" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:group name="subRegionGroup">
+        <xsd:choice>
+            <xsd:element name="lookup-region" type="lookupSubRegionType" />
+            <xsd:element name="replicated-region" type="replicatedSubRegionType" />
+            <xsd:element name="partitioned-region" type="partitionedSubRegionType" />
+        </xsd:choice>
+    </xsd:group>
+    <!-- -->
+    <xsd:attributeGroup name="topLevelRegionAttributes">
+        <xsd:attribute name="id" type="xsd:ID" use="required">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The id of the region bean definition.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfire-cache">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="cache-ref" type="xsd:string"
+            use="optional" default="gemfire-cache">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The name of the bean defining the GemFire cache (by default 'gemfire-cache').
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:attributeGroup>
-	<!-- -->
-	<xsd:element name="lookup-region" type="lookupRegionType"/>
-	<!-- -->	
-	<xsd:complexType name="replicatedSubRegionType">
-		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.gemfire.RegionFactoryBean"><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+    <!-- -->
+    <xsd:element name="lookup-region" type="lookupRegionType" />
+    <!-- -->
+    <xsd:complexType name="replicatedSubRegionType">
+        <xsd:annotation>
+            <xsd:documentation
+                source="org.springframework.data.gemfire.RegionFactoryBean"><![CDATA[
 Defines a GemFire replicated region instance. Each replicated region contains a complete copy of the data.
 As well as high availability, replication provides excellent performance as each region contains a complete,
 up to date copy of the data.
             ]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.Region"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="subRegionType">
-				<xsd:sequence minOccurs="1" maxOccurs="1">
-					<xsd:element name="eviction" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports type="com.gemstone.gemfire.cache.Region" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="subRegionType">
+                <xsd:sequence minOccurs="1" maxOccurs="1">
+                    <xsd:element name="eviction" minOccurs="0"
+                        maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 Eviction policy for the replicated region.
                                 ]]></xsd:documentation>
-						</xsd:annotation>
-						<xsd:complexType>
-							<xsd:complexContent>
-								<xsd:extension base="evictionType">
-									<xsd:attribute name="action" type="evictionActionType" fixed="OVERFLOW_TO_DISK">
-										<xsd:annotation>
-											<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                        <xsd:complexType>
+                            <xsd:complexContent>
+                                <xsd:extension base="evictionType">
+                                    <xsd:attribute name="action"
+                                        type="evictionActionType" fixed="OVERFLOW_TO_DISK">
+                                        <xsd:annotation>
+                                            <xsd:documentation><![CDATA[
 The action to take when performing eviction.
                                                 ]]></xsd:documentation>
-										</xsd:annotation>
-									</xsd:attribute>
-								</xsd:extension>
-							</xsd:complexContent>
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<!-- -->
-	<xsd:complexType name="replicatedRegionType">
-		<xsd:complexContent>
-			<xsd:extension base="replicatedSubRegionType">
-				<xsd:group ref="subRegionGroup" minOccurs="0" maxOccurs="unbounded"/>
-				<xsd:attributeGroup ref="topLevelRegionAttributes"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-<!-- -->
-	<xsd:element name="replicated-region" type="replicatedRegionType"/>
-<!-- -->
-	<xsd:complexType name="partitionedSubRegionType">
-		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.gemfire.RegionFactoryBean"><![CDATA[
+                                        </xsd:annotation>
+                                    </xsd:attribute>
+                                </xsd:extension>
+                            </xsd:complexContent>
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:group ref="subRegionGroup" minOccurs="0"
+                        maxOccurs="unbounded" />
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:complexType name="replicatedRegionType">
+        <xsd:complexContent>
+            <xsd:extension base="replicatedSubRegionType">
+                <xsd:group ref="subRegionGroup" minOccurs="0"
+                    maxOccurs="unbounded" />
+                <xsd:attributeGroup ref="topLevelRegionAttributes" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:element name="replicated-region" type="replicatedRegionType" />
+    <!-- -->
+    <xsd:complexType name="partitionedSubRegionType">
+        <xsd:annotation>
+            <xsd:documentation
+                source="org.springframework.data.gemfire.RegionFactoryBean"><![CDATA[
 Defines a GemFire partitioned region instance. Through partitioning, the data is split across regions.
 Partitioning is useful when the amount of data to store is too large for one member to hold and work
 with as if it were a single entity. One can configure the partitioned region to store redundant copies
 in different members, for high availability in case of an application failure.
 			]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.Region"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="subRegionType">
-				<xsd:sequence>
-					<xsd:element name="partition-resolver" type="beanDeclarationType" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation source="com.gemstone.gemfire.cache.PartitionResolver"><![CDATA[
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports type="com.gemstone.gemfire.cache.Region" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="subRegionType">
+                <xsd:sequence>
+                    <xsd:element name="partition-resolver"
+                        type="beanDeclarationType" minOccurs="0"
+                        maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation
+                                source="com.gemstone.gemfire.cache.PartitionResolver"><![CDATA[
 The partition resolver definition for this region, allowing for custom partitioning. GemFire uses the resolver to
 colocate data based on custom criterias (such as colocating trades by month and year).
 								]]></xsd:documentation>
-							<xsd:appinfo>
-								<tool:annotation>
-									<tool:exports type="com.gemstone.gemfire.cache.PartitionResolver"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="eviction" minOccurs="0" maxOccurs="1">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                            <xsd:appinfo>
+                                <tool:annotation>
+                                    <tool:exports
+                                        type="com.gemstone.gemfire.cache.PartitionResolver" />
+                                </tool:annotation>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="eviction" minOccurs="0"
+                        maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 Eviction policy for the partitioned region.
 								]]></xsd:documentation>
-						</xsd:annotation>
-						<xsd:complexType>
-							<xsd:complexContent>
-								<xsd:extension base="evictionType">
-									<xsd:attribute name="action" type="evictionActionType" default="LOCAL_DESTROY">
-										<xsd:annotation>
-											<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                        <xsd:complexType>
+                            <xsd:complexContent>
+                                <xsd:extension base="evictionType">
+                                    <xsd:attribute name="action"
+                                        type="evictionActionType"
+                                        default="LOCAL_DESTROY">
+                                        <xsd:annotation>
+                                            <xsd:documentation><![CDATA[
 The action to take when performing eviction.
 												]]></xsd:documentation>
-										</xsd:annotation>
-									</xsd:attribute>
-								</xsd:extension>
-							</xsd:complexContent>
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="copies" use="optional" default="0">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                                        </xsd:annotation>
+                                    </xsd:attribute>
+                                </xsd:extension>
+                            </xsd:complexContent>
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="copies" use="optional"
+                    default="0">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 The number of copies for each partition for high-availability. By default, no copies are created meaning there is no
 redundancy. Each copy provides extra backup at the expense of extra storages.
 						]]></xsd:documentation>
-					</xsd:annotation>
-					<xsd:simpleType>
-						<xsd:restriction base="xsd:byte">
-							<xsd:minInclusive value="0"/>
-							<xsd:maxInclusive value="3"/>
-						</xsd:restriction>
-					</xsd:simpleType>
-				</xsd:attribute>
-				<xsd:attribute name="colocated-with" type="xsd:string" use="optional">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:byte">
+                            <xsd:minInclusive value="0" />
+                            <xsd:maxInclusive value="3" />
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="colocated-with" type="xsd:string"
+                    use="optional">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 The name of the partitioned region with which this newly created partitioned region is colocated.
 							]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="local-max-memory" type="xsd:string" use="optional">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="local-max-memory"
+                    type="xsd:string" use="optional">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 The maximum amount of memory, in megabytes, to be used by the region in this process. If not set, a default of 90%
 of available heap is used.
 							]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="total-max-memory" type="xsd:string" use="optional">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="total-max-memory"
+                    type="xsd:string" use="optional">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 The maximum amount of memory, in megabytes, to be used by the region in all process.
 
 Note: This setting must be the same in all processes using the region.
 							]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="total-buckets" type="xsd:string" use="optional">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="total-buckets" type="xsd:string"
+                    use="optional">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 The total number of hash buckets to be used by the region in all processes. 
 
 A bucket is the smallest unit of data management in a partitioned region. Entries are stored in buckets and buckets may
@@ -641,317 +734,345 @@ The number of buckets should be prime and as a rough guide at the least four tim
  
 Note: This setting must be the same in all processes using the region.
 							]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="recovery-delay" type="xsd:string" use="optional" default="-1">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="recovery-delay" type="xsd:string"
+                    use="optional" default="-1">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 The delay in milliseconds that existing members will wait before satisfying redundancy after another member crashes.
 -1 (the default) indicates that redundancy will not be recovered after a failure.
 							]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="startup-recovery-delay" type="xsd:string" use="optional" default="-1">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="startup-recovery-delay"
+                    type="xsd:string" use="optional" default="-1">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 The delay in milliseconds that new members will wait before satisfying redundancy. -1 indicates that adding new members
  will not trigger redundancy recovery. The default is to recover redundancy immediately when a new member is added.
  							]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-<!-- -->	
-	<xsd:complexType name="partitionedRegionType">
-		<xsd:complexContent>
-			<xsd:extension base="partitionedSubRegionType">
-				<xsd:group ref="subRegionGroup" minOccurs="0" maxOccurs="unbounded"/>
-				<xsd:attributeGroup ref="topLevelRegionAttributes"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-<!-- -->	
-	<xsd:element name="partitioned-region" type="partitionedRegionType"/>
-<!-- -->
-	<xsd:complexType name="expirationType">
-		<xsd:attribute name="timeout" type="xsd:string" default="0">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:complexType name="partitionedRegionType">
+        <xsd:complexContent>
+            <xsd:extension base="partitionedSubRegionType">
+                <!-- subRegions not supported -->
+                <xsd:attributeGroup ref="topLevelRegionAttributes" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:element name="partitioned-region" type="partitionedRegionType" />
+    <!-- -->
+    <xsd:complexType name="expirationType">
+        <xsd:attribute name="timeout" type="xsd:string"
+            default="0">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The amount of time before the expiration action takes place. Defaults to zero (which means never timeout). 
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="action" default="INVALIDATE">
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="INVALIDATE">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="action" default="INVALIDATE">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="INVALIDATE">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 When the region or cached object expires, it is invalidated. 
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-					<xsd:enumeration value="DESTROY">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="DESTROY">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 When the region or cached object expires, it is destroyed.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-					<xsd:enumeration value="LOCAL_INVALIDATE">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="LOCAL_INVALIDATE">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 When the region or cached object expires, it is invalidated locally only. Not supported on partitioned regions.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-					<xsd:enumeration value="LOCAL_DESTROY">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="LOCAL_DESTROY">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 When the region or cached object expires, it is destroyed locally only. Not supported on partitioned regions.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
-	</xsd:complexType>
-<!-- -->
-	<xsd:complexType name="evictionType">
-		<xsd:sequence minOccurs="0" maxOccurs="1">
-			<xsd:element name="object-sizer" type="beanDeclarationType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:complexType name="evictionType">
+        <xsd:sequence minOccurs="0" maxOccurs="1">
+            <xsd:element name="object-sizer" type="beanDeclarationType">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 Entity computing sizes for objects stored into the grid.
 					]]></xsd:documentation>
-					<xsd:appinfo>
-						<tool:annotation>
-							<tool:exports type="com.gemstone.gemfire.cache.util.ObjectSizer"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="type" default="ENTRY_COUNT">
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="ENTRY_COUNT">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                    <xsd:appinfo>
+                        <tool:annotation>
+                            <tool:exports
+                                type="com.gemstone.gemfire.cache.util.ObjectSizer" />
+                        </tool:annotation>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="type" default="ENTRY_COUNT">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="ENTRY_COUNT">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 Considers the number of entries in the region before performing an eviction.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-					<xsd:enumeration value="MEMORY_SIZE">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="MEMORY_SIZE">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 Considers the amount of memory consumed by the region before performing an eviction.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-					<xsd:enumeration value="HEAP_PERCENTAGE">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="HEAP_PERCENTAGE">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 Considers the amount of heap used (through the GemFire resource manager) before performing an eviction.
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:enumeration>
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="threshold" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="threshold" type="xsd:string"
+            use="required">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The threshold (or limit) against which the eviction algorithm runs. Once the threashold is reached, eviction is
 performed.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-<!-- -->	
-	<xsd:simpleType name="evictionActionType">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="LOCAL_DESTROY">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:simpleType name="evictionActionType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="LOCAL_DESTROY">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The LRU (least-recently-used) region entries is locally destroyed.
 
 Note: this option is not compatible with replicated regions (as it render the replica region incomplete).  
 							]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-			<xsd:enumeration value="OVERFLOW_TO_DISK">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:enumeration>
+            <xsd:enumeration value="OVERFLOW_TO_DISK">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The LRU (least-recently-used) region entry values are written to disk and nulled-out in the member to 
 reclaim memory.
 							]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="diskStoreType">
-		<xsd:sequence>
-			<xsd:element name="disk-dir" minOccurs="0" maxOccurs="unbounded">
-				<xsd:complexType>
-					<xsd:attribute name="location" type="xsd:string" use="required">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:enumeration>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="diskStoreType">
+        <xsd:sequence>
+            <xsd:element name="disk-dir" minOccurs="0"
+                maxOccurs="unbounded">
+                <xsd:complexType>
+                    <xsd:attribute name="location" type="xsd:string"
+                        use="required">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 Directory on the file system for storing data.
 
 Note: the directory must already exist.						
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="max-size" type="xsd:string" default="10240">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="max-size" type="xsd:string"
+                        default="10240">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 The maximum size (in megabytes) of data stored in each directory. Default is 10240 MB (10 gigabytes). 
 							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="synchronous-write" type="xsd:string" default="false">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="synchronous-write" type="xsd:string"
+            default="false">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Indicates whether the writing to the disk si synchronous or not. Default is false, meaning asynchronous writing.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="auto-compact" type="xsd:string" default="true">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="auto-compact" type="xsd:string"
+            default="true">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Indicates whether or not the operation logs are automatically compacted or not. Default is true.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="max-oplog-size" type="xsd:string" default="1024">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="max-oplog-size" type="xsd:string"
+            default="1024">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Sets the maximum size in megabytes a single oplog (operation log) is allowed to be. When an oplog is created this 
 amount of file space will be immediately reserved. 
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="time-interval" type="xsd:string" default="1">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="time-interval" type="xsd:string"
+            default="1">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Sets the number of milliseconds that can elapse before unwritten data is written to disk. 
 It is considered only for asynchronous writing. 
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="queue-size" type="xsd:string" default="0">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="queue-size" type="xsd:string"
+            default="0">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The maximum number of operations that can be asynchronously queued. Once this many pending async operations have been 
 queued async ops will begin blocking until some of the queued ops have been flushed to disk.
 Considered only for asynchronous writing.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<!-- <xsd:attribute name="compaction-threshold" default="50"> <xsd:annotation> 
-            <xsd:documentation><![CDATA[ Sets the threshold at which an oplog will become 
-            compactable. Until it reaches this threshold the oplog will not be compacted. 
-            The threshold is a percentage in the range 0..100. When the amount of garbage 
-            in an oplog exceeds this percentage then when a compaction is done this garbage 
-            will be cleaned up freeing up disk space. Garbage is created by entry destroys, 
-            entry updates, and region destroys. ]]> </xsd:documentation> </xsd:annotation> 
-            <xsd:simpleType> <xsd:restriction base="xsd:short"> <xsd:minExclusive value="0"/> 
+            </xsd:annotation>
+        </xsd:attribute>
+        <!-- <xsd:attribute name="compaction-threshold" default="50"> <xsd:annotation>
+            <xsd:documentation><![CDATA[ Sets the threshold at which an oplog will become
+            compactable. Until it reaches this threshold the oplog will not be compacted.
+            The threshold is a percentage in the range 0..100. When the amount of garbage
+            in an oplog exceeds this percentage then when a compaction is done this garbage
+            will be cleaned up freeing up disk space. Garbage is created by entry destroys,
+            entry updates, and region destroys. ]]> </xsd:documentation> </xsd:annotation>
+            <xsd:simpleType> <xsd:restriction base="xsd:short"> <xsd:minExclusive value="0"/>
             <xsd:maxExclusive value="100"/> </xsd:restriction> </xsd:simpleType> </xsd:attribute> -->
-	</xsd:complexType>
-	<!-- -->
-	<xsd:element name="client-region">
-		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.gemfire.client.ClientRegionFactoryBean"><![CDATA[
+    </xsd:complexType>
+    <!-- -->
+    <xsd:element name="client-region">
+        <xsd:annotation>
+            <xsd:documentation
+                source="org.springframework.data.gemfire.client.ClientRegionFactoryBean"><![CDATA[
 Defines a GemFire client region instance. A client region is connected to a (long-lived) farm of GemFire servers from
 which it receives its data. The client can hold some data locally or forward all requests to the server.
 			]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.Region"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="readOnlyRegionType">
-					<xsd:sequence>
-						<xsd:choice minOccurs="0" maxOccurs="unbounded">
-							<xsd:element name="key-interest">
-								<xsd:annotation>
-									<xsd:documentation><![CDATA[
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports type="com.gemstone.gemfire.cache.Region" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="readOnlyRegionType">
+                    <xsd:sequence>
+                        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                            <xsd:element name="key-interest">
+                                <xsd:annotation>
+                                    <xsd:documentation><![CDATA[
 Key based interest. If the key is a List, then all the keys in the List will be registered. The key can also be the 
 special token 'ALL_KEYS', which will register interest in all keys in the region. In effect, this will cause an update 
 to any key in this region in the CacheServer to be pushed to the client. 
 									]]></xsd:documentation>
-								</xsd:annotation>
-								<xsd:complexType>
-									<xsd:complexContent>
-										<xsd:extension base="interestType">
-											<xsd:sequence minOccurs="0" maxOccurs="1">
-												<xsd:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded">
-													<xsd:annotation>
-														<xsd:documentation><![CDATA[
+                                </xsd:annotation>
+                                <xsd:complexType>
+                                    <xsd:complexContent>
+                                        <xsd:extension
+                                            base="interestType">
+                                            <xsd:sequence
+                                                minOccurs="0" maxOccurs="1">
+                                                <xsd:any
+                                                    namespace="##other"
+                                                    processContents="skip"
+                                                    minOccurs="0"
+                                                    maxOccurs="unbounded">
+                                                    <xsd:annotation>
+                                                        <xsd:documentation><![CDATA[
 Inner bean definition of the client key interest.
 														]]></xsd:documentation>
-													</xsd:annotation>
-												</xsd:any>
-											</xsd:sequence>
-											<xsd:attribute name="key-ref" type="xsd:string" use="optional">
-												<xsd:annotation>
-													<xsd:documentation><![CDATA[
+                                                    </xsd:annotation>
+                                                </xsd:any>
+                                            </xsd:sequence>
+                                            <xsd:attribute
+                                                name="key-ref" type="xsd:string"
+                                                use="optional">
+                                                <xsd:annotation>
+                                                    <xsd:documentation><![CDATA[
 The name of the client key interest bean referred by this declaration. Used as a convenience method. If no reference exists, 
 use the inner bean declaration.
 													]]></xsd:documentation>
-												</xsd:annotation>
-											</xsd:attribute>
-										</xsd:extension>
-									</xsd:complexContent>
-								</xsd:complexType>
-							</xsd:element>
-							<xsd:element name="regex-interest">
-								<xsd:annotation>
-									<xsd:documentation><![CDATA[
+                                                </xsd:annotation>
+                                            </xsd:attribute>
+                                        </xsd:extension>
+                                    </xsd:complexContent>
+                                </xsd:complexType>
+                            </xsd:element>
+                            <xsd:element name="regex-interest">
+                                <xsd:annotation>
+                                    <xsd:documentation><![CDATA[
 Regular expression based interest. If the pattern is '.*' then all keys of any type will be pushed to the client. 
 									]]></xsd:documentation>
-								</xsd:annotation>
-								<xsd:complexType>
-									<xsd:complexContent>
-										<xsd:extension base="interestType">
-											<xsd:attribute name="pattern" type="xsd:string"/>
-										</xsd:extension>
-									</xsd:complexContent>
-								</xsd:complexType>
-							</xsd:element>
-						</xsd:choice>
-						<xsd:element name="eviction" minOccurs="0" maxOccurs="1">
-							<xsd:annotation>
-								<xsd:documentation><![CDATA[
+                                </xsd:annotation>
+                                <xsd:complexType>
+                                    <xsd:complexContent>
+                                        <xsd:extension
+                                            base="interestType">
+                                            <xsd:attribute
+                                                name="pattern" type="xsd:string" />
+                                        </xsd:extension>
+                                    </xsd:complexContent>
+                                </xsd:complexType>
+                            </xsd:element>
+                        </xsd:choice>
+                        <xsd:element name="eviction"
+                            minOccurs="0" maxOccurs="1">
+                            <xsd:annotation>
+                                <xsd:documentation><![CDATA[
 Eviction policy for the partitioned region.
 								]]></xsd:documentation>
-							</xsd:annotation>
-							<xsd:complexType>
-								<xsd:complexContent>
-									<xsd:extension base="evictionType">
-										<xsd:attribute name="action" type="evictionActionType" default="LOCAL_DESTROY">
-											<xsd:annotation>
-												<xsd:documentation><![CDATA[
+                            </xsd:annotation>
+                            <xsd:complexType>
+                                <xsd:complexContent>
+                                    <xsd:extension base="evictionType">
+                                        <xsd:attribute
+                                            name="action" type="evictionActionType"
+                                            default="LOCAL_DESTROY">
+                                            <xsd:annotation>
+                                                <xsd:documentation><![CDATA[
 The action to take when performing eviction.
 												]]></xsd:documentation>
-											</xsd:annotation>
-										</xsd:attribute>
-									</xsd:extension>
-								</xsd:complexContent>
-							</xsd:complexType>
-						</xsd:element>
-					</xsd:sequence>
-					<xsd:attribute name="data-policy" use="optional" default="NORMAL">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                                            </xsd:annotation>
+                                        </xsd:attribute>
+                                    </xsd:extension>
+                                </xsd:complexContent>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                    <xsd:attribute name="data-policy" use="optional"
+                        default="NORMAL">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 The data policy for this client. Can be either 'EMPTY' or 'NORMAL' (the default). In case persistence or overflow are
 configured for this region, this parameter will be ignored.
 
@@ -961,465 +1082,556 @@ EMPTY - causes data to never be stored in local memory. The region will always a
 NORMAL - causes data that this region is interested in to be stored in local memory. It allows the contents in this 
 cache to differ from other caches.  
  							]]></xsd:documentation>
-						</xsd:annotation>
-						<xsd:simpleType>
-							<xsd:restriction base="xsd:string">
-								<xsd:enumeration value="EMPTY"/>
-								<xsd:enumeration value="NORMAL"/>
-							</xsd:restriction>
-						</xsd:simpleType>
-					</xsd:attribute>
-					<xsd:attribute name="pool-name" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                        <xsd:simpleType>
+                            <xsd:restriction base="xsd:string">
+                                <xsd:enumeration value="EMPTY" />
+                                <xsd:enumeration value="NORMAL" />
+                            </xsd:restriction>
+                        </xsd:simpleType>
+                    </xsd:attribute>
+                    <xsd:attribute name="pool-name" type="xsd:string"
+                        use="optional">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 The name of the pool used by this client. If not set, a default pool (initialized when using client-cache) will be used.
  							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="shortcut" use="optional">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="shortcut" use="optional">
+                        <xsd:annotation>
+                            <xsd:documentation><![CDATA[
 The ClientRegionShortcut for this region. Allows easy initialization of the region based on defaults.
  							]]></xsd:documentation>
-						</xsd:annotation>
-						<xsd:simpleType>
-							<xsd:restriction base="xsd:string">
-								<xsd:enumeration value="PROXY"/>
-								<xsd:enumeration value="CACHING_PROXY"/>
-								<xsd:enumeration value="CACHING_PROXY_HEAP_LRU"/>
-								<xsd:enumeration value="CACHING_PROXY_OVERFLOW"/>
-								<xsd:enumeration value="LOCAL"/>
-								<xsd:enumeration value="LOCAL_PERSISTENT"/>
-								<xsd:enumeration value="LOCAL_HEAP_LRU"/>
-								<xsd:enumeration value="LOCAL_OVERFLOW"/>
-								<xsd:enumeration value="LOCAL_PERSISTENT_OVERFLOW"/>
-							</xsd:restriction>
-						</xsd:simpleType>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-<!-- -->
-	<xsd:complexType name="connectionType">
-		<xsd:attribute name="host" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+                        </xsd:annotation>
+                        <xsd:simpleType>
+                            <xsd:restriction base="xsd:string">
+                                <xsd:enumeration value="PROXY" />
+                                <xsd:enumeration value="CACHING_PROXY" />
+                                <xsd:enumeration
+                                    value="CACHING_PROXY_HEAP_LRU" />
+                                <xsd:enumeration
+                                    value="CACHING_PROXY_OVERFLOW" />
+                                <xsd:enumeration value="LOCAL" />
+                                <xsd:enumeration value="LOCAL_PERSISTENT" />
+                                <xsd:enumeration value="LOCAL_HEAP_LRU" />
+                                <xsd:enumeration value="LOCAL_OVERFLOW" />
+                                <xsd:enumeration
+                                    value="LOCAL_PERSISTENT_OVERFLOW" />
+                            </xsd:restriction>
+                        </xsd:simpleType>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <!-- -->
+    <xsd:complexType name="connectionType">
+        <xsd:attribute name="host" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The host name or ip address of the connection.				
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="port">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="port">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The port number of the connection (between 1 and 65535 inclusive).				
 				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:string"/>
-			</xsd:simpleType>
-		</xsd:attribute>
-	</xsd:complexType>
-<!-- -->
-	<xsd:complexType name="interestType" abstract="true">
-		<xsd:attribute name="durable" type="xsd:string" use="optional" default="false">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string" />
+            </xsd:simpleType>
+        </xsd:attribute>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:complexType name="interestType" abstract="true">
+        <xsd:attribute name="durable" type="xsd:string"
+            use="optional" default="false">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Indicates whether or not the registered interest is durable or not. Default is false.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="result-policy" use="optional" default="KEYS_VALUES">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="result-policy" use="optional"
+            default="KEYS_VALUES">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The result policy for this interest. Can be one of 'KEYS' or 'KEYS_VALUES' (the default) or 'NONE'. 
 
 KEYS - Initializes the local cache with the keys satisfying the request.
 KEYS-VALUES - initializes the local cache with the keys and current values satisfying the request.
 NONE -  Does not initialize the local cache.
 					]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="KEYS"/>
-					<xsd:enumeration value="KEYS_VALUES"/>
-					<xsd:enumeration value="NONE"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="receive-values" type="xsd:string" use="optional" default="true">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="KEYS" />
+                    <xsd:enumeration value="KEYS_VALUES" />
+                    <xsd:enumeration value="NONE" />
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="receive-values" type="xsd:string"
+            use="optional" default="true">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Indicates whether values are received with create and update events on keys of interest (true) 
 or only invalidations are received and the value will be received on the next get instead (false).
 Default is true.
 				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-<!-- -->
-	<xsd:element name="pool">
-		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.gemfire.client.PoolFactoryBean"><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:element name="pool">
+        <xsd:annotation>
+            <xsd:documentation
+                source="org.springframework.data.gemfire.client.PoolFactoryBean"><![CDATA[
 Defines a pool for connections from a client to a set of GemFire Cache Servers.
 
 Note that in order to instantiate a pool, a GemFire cache needs to be already started.
 			]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.client.Pool"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:choice minOccurs="1" maxOccurs="1">
-				<xsd:element name="locator" type="connectionType" minOccurs="1" maxOccurs="unbounded"/>
-				<xsd:element name="server" type="connectionType" minOccurs="1" maxOccurs="unbounded"/>
-			</xsd:choice>
-			<xsd:attribute name="id" type="xsd:ID" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports
+                        type="com.gemstone.gemfire.cache.client.Pool" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:choice minOccurs="1" maxOccurs="1">
+                <xsd:element name="locator" type="connectionType"
+                    minOccurs="1" maxOccurs="unbounded" />
+                <xsd:element name="server" type="connectionType"
+                    minOccurs="1" maxOccurs="unbounded" />
+            </xsd:choice>
+            <xsd:attribute name="id" type="xsd:ID" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The name of the pool definition (by default "gemfire-pool").]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="free-connection-timeout" type="xsd:string" use="optional"/>
-			<xsd:attribute name="idle-timeout" type="xsd:string" use="optional"/>
-			<xsd:attribute name="load-conditioning-interval" type="xsd:string" use="optional"/>
-			<xsd:attribute name="max-connections" type="xsd:string" use="optional"/>
-			<xsd:attribute name="min-connections" type="xsd:string" use="optional"/>
-			<xsd:attribute name="multi-user-authentication" type="xsd:string" use="optional"/>
-			<xsd:attribute name="ping-interval" type="xsd:string" use="optional"/>
-			<xsd:attribute name="pr-single-hop-enabled" type="xsd:string" use="optional"/>
-			<xsd:attribute name="read-timeout" type="xsd:string" use="optional"/>
-			<xsd:attribute name="retry-attempts" type="xsd:string" use="optional"/>
-			<xsd:attribute name="server-group" type="xsd:string" use="optional"/>
-			<xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional"/>
-			<xsd:attribute name="statistic-interval" type="xsd:string" use="optional"/>
-			<xsd:attribute name="subscription-ack-interval" type="xsd:string" use="optional"/>
-			<xsd:attribute name="subscription-enabled" type="xsd:string" use="optional"/>
-			<xsd:attribute name="subscription-message-tracking-timeout" type="xsd:string" use="optional"/>
-			<xsd:attribute name="subscription-redundancy" type="xsd:string" use="optional"/>
-			<xsd:attribute name="thread-local-connections" type="xsd:string" use="optional"/>
-		</xsd:complexType>
-	</xsd:element>
-<!-- -->
-	<xsd:element name="cache-server">
-		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.gemfire.server.CacheServerFactoryBean"><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="free-connection-timeout"
+                type="xsd:string" use="optional" />
+            <xsd:attribute name="idle-timeout" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="load-conditioning-interval"
+                type="xsd:string" use="optional" />
+            <xsd:attribute name="max-connections" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="min-connections" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="multi-user-authentication"
+                type="xsd:string" use="optional" />
+            <xsd:attribute name="ping-interval" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="pr-single-hop-enabled"
+                type="xsd:string" use="optional" />
+            <xsd:attribute name="read-timeout" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="retry-attempts" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="server-group" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="socket-buffer-size" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="statistic-interval" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="subscription-ack-interval"
+                type="xsd:string" use="optional" />
+            <xsd:attribute name="subscription-enabled"
+                type="xsd:string" use="optional" />
+            <xsd:attribute name="subscription-message-tracking-timeout"
+                type="xsd:string" use="optional" />
+            <xsd:attribute name="subscription-redundancy"
+                type="xsd:string" use="optional" />
+            <xsd:attribute name="thread-local-connections"
+                type="xsd:string" use="optional" />
+        </xsd:complexType>
+    </xsd:element>
+    <!-- -->
+    <xsd:element name="cache-server">
+        <xsd:annotation>
+            <xsd:documentation
+                source="org.springframework.data.gemfire.server.CacheServerFactoryBean"><![CDATA[
 Defines a Cache Server for feeding data to remote gemfire clients to a server GemFire Cache Servers.
 Note: In order to instantiate a cacheserver, a GemFire cache needs to be avaialble in the VM.
 			]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.server.CacheServer"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence minOccurs="0" maxOccurs="1">
-				<xsd:element name="subscription-config" minOccurs="0" maxOccurs="1">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports
+                        type="com.gemstone.gemfire.cache.server.CacheServer" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence minOccurs="0" maxOccurs="1">
+                <xsd:element name="subscription-config"
+                    minOccurs="0" maxOccurs="1">
+                    <xsd:annotation>
+                        <xsd:documentation><![CDATA[
 The client subscription configuration that is used to control a clients use of server resources towards notification queues.				
 				]]></xsd:documentation>
-					</xsd:annotation>
-					<xsd:complexType>
-						<xsd:attribute name="eviction-type" use="optional" default="NONE">
-							<xsd:simpleType>
-								<xsd:restriction base="xsd:string">
-									<xsd:enumeration value="NONE"/>
-									<xsd:enumeration value="MEM"/>
-									<xsd:enumeration value="ENTRY"/>
-								</xsd:restriction>
-							</xsd:simpleType>
-						</xsd:attribute>
-						<xsd:attribute name="capacity" type="xsd:string" use="optional" default="1"/>
-						<xsd:attribute name="disk-store" type="xsd:string" use="optional" default="."/>
-					</xsd:complexType>
-				</xsd:element>
-			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[The name of the cache server definition (by default "gemfire-server").]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string" use="optional" default="true"/>
-			<xsd:attribute name="bind-address" type="xsd:string" use="optional"/>
-			<xsd:attribute name="port" type="xsd:string" use="optional" default="40404">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[The port number of the server.]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="host-name-for-clients" type="xsd:string" use="optional"/>
-			<xsd:attribute name="load-poll-interval" type="xsd:string" use="optional" default="5000"/>
-			<xsd:attribute name="max-connections" type="xsd:string" use="optional" default="800"/>
-			<xsd:attribute name="max-threads" type="xsd:string" use="optional" default="0"/>
-			<xsd:attribute name="max-message-count" type="xsd:string" use="optional" default="230000"/>
-			<xsd:attribute name="max-time-between-pings" type="xsd:string" use="optional" default="60000"/>
-			<xsd:attribute name="message-time-to-live" type="xsd:string" use="optional" default="180"/>
-			<xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional" default="32768"/>
-			<xsd:attribute name="notify-by-subscription" type="xsd:string" use="optional" default="true"/>
-			<xsd:attribute name="groups" type="xsd:string" use="optional" default="">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                    </xsd:annotation>
+                    <xsd:complexType>
+                        <xsd:attribute name="eviction-type"
+                            use="optional" default="NONE">
+                            <xsd:simpleType>
+                                <xsd:restriction base="xsd:string">
+                                    <xsd:enumeration
+                                        value="NONE" />
+                                    <xsd:enumeration
+                                        value="MEM" />
+                                    <xsd:enumeration
+                                        value="ENTRY" />
+                                </xsd:restriction>
+                            </xsd:simpleType>
+                        </xsd:attribute>
+                        <xsd:attribute name="capacity"
+                            type="xsd:string" use="optional" default="1" />
+                        <xsd:attribute name="disk-store"
+                            type="xsd:string" use="optional" default="." />
+                    </xsd:complexType>
+                </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute name="id" type="xsd:ID" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[The name of the cache server definition (by default "gemfire-server").]]></xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="auto-startup" type="xsd:string"
+                use="optional" default="true" />
+            <xsd:attribute name="bind-address" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="port" type="xsd:string"
+                use="optional" default="40404">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[The port number of the server.]]></xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="host-name-for-clients"
+                type="xsd:string" use="optional" />
+            <xsd:attribute name="load-poll-interval" type="xsd:string"
+                use="optional" default="5000" />
+            <xsd:attribute name="max-connections" type="xsd:string"
+                use="optional" default="800" />
+            <xsd:attribute name="max-threads" type="xsd:string"
+                use="optional" default="0" />
+            <xsd:attribute name="max-message-count" type="xsd:string"
+                use="optional" default="230000" />
+            <xsd:attribute name="max-time-between-pings"
+                type="xsd:string" use="optional" default="60000" />
+            <xsd:attribute name="message-time-to-live"
+                type="xsd:string" use="optional" default="180" />
+            <xsd:attribute name="socket-buffer-size" type="xsd:string"
+                use="optional" default="32768" />
+            <xsd:attribute name="notify-by-subscription"
+                type="xsd:string" use="optional" default="true" />
+            <xsd:attribute name="groups" type="xsd:string"
+                use="optional" default="">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The server groups that this server will be a member of given as a comma separated values list.				
 				]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="load-probe-ref" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[The name of the bean defining the CacheServer Load Probe.]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfire-cache">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[The name of the bean defining the GemFire cache (by default 'gemfire-cache').]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-<!-- -->
-	<xsd:element name="cq-listener-container">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="load-probe-ref" type="xsd:string"
+                use="optional">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[The name of the bean defining the CacheServer Load Probe.]]></xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="cache-ref" type="xsd:string"
+                use="optional" default="gemfire-cache">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[The name of the bean defining the GemFire cache (by default 'gemfire-cache').]]></xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    <!-- -->
+    <xsd:element name="cq-listener-container">
+        <xsd:annotation>
+            <xsd:documentation><![CDATA[
 Container for continuous query listeners. All listeners will be hosted by the same container.
 	      ]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="listener" type="listenerType" minOccurs="0" maxOccurs="unbounded"/>
-			</xsd:sequence>
-			<xsd:attribute name="cache" type="xsd:string" default="gemfire-cache">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports
+                        type="org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="listener" type="listenerType"
+                    minOccurs="0" maxOccurs="unbounded" />
+            </xsd:sequence>
+            <xsd:attribute name="cache" type="xsd:string"
+                default="gemfire-cache">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 A reference (by name) to the GemFire cache bean. Default is "gemfire-cache".
 	          ]]></xsd:documentation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="com.gemstone.gemfire.cache.RegionService"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="task-executor" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                    <xsd:appinfo>
+                        <tool:annotation kind="ref">
+                            <tool:expected-type
+                                type="com.gemstone.gemfire.cache.RegionService" />
+                        </tool:annotation>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="task-executor" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 A reference to a Spring TaskExecutor (or standard JDK 1.5 Executor) for executing
 GemFire listener invokers. Default is a SimpleAsyncTaskExecutor.
 	          ]]></xsd:documentation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="java.util.concurrent.Executor"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="phase" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                    <xsd:appinfo>
+                        <tool:annotation kind="ref">
+                            <tool:expected-type
+                                type="java.util.concurrent.Executor" />
+                        </tool:annotation>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="phase" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The lifecycle phase within which this container should start and stop. The lower
 the value the earlier this container will start and the later it will stop. The
 default is Integer.MAX_VALUE meaning the container will start as late as possible
 and stop as soon as possible.
 	          ]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="pool-name" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="pool-name" type="xsd:string"
+                use="optional">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The name of the pool used by the container.
  						]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-<!-- -->
-	<xsd:complexType name="listenerType">
-		<xsd:attribute name="ref" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    <!-- -->
+    <xsd:complexType name="listenerType">
+        <xsd:attribute name="ref" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The bean name of the listener object, implementing the ContinuousQueryListener interface or defining the specified listener method.
 Required.
 	        ]]></xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref"/>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="query" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+                <xsd:appinfo>
+                    <tool:annotation kind="ref" />
+                </xsd:appinfo>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="query" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The query for the GemFire continuous query. 
 	        ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="method" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="method" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The name of the listener method to invoke. If not specified, the target bean is supposed to implement the ContinuousQueryListener
 interface or provide a method named 'handleEvent'.
 	        ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="name" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="name" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 The name of the resulting GemFire continuous query. Useful for monitoring and statistics querying. 
 	        ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="durable" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="durable" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation><![CDATA[
 Whether the resulting GemFire continuous query is durable or not. 
 	        ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-<!-- -->
-	<xsd:element name="index">
-		<xsd:annotation>
-			<xsd:documentation source="org.springframework.data.gemfire.IndexFactoryBean"><![CDATA[
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:element name="index">
+        <xsd:annotation>
+            <xsd:documentation
+                source="org.springframework.data.gemfire.IndexFactoryBean"><![CDATA[
 Defines a GemFire index.
 			]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="com.gemstone.gemfire.cache.query.Index"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+            <xsd:appinfo>
+                <tool:annotation>
+                    <tool:exports
+                        type="com.gemstone.gemfire.cache.query.Index" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:attribute name="id" type="xsd:ID">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The name of the bean index definition. If property 'name' is not set, it will be used as the index name as well.]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="type" use="optional" default="FUNCTIONAL">
-				<xsd:simpleType>
-					<xsd:restriction base="xsd:string">
-						<xsd:enumeration value="FUNCTIONAL"/>
-						<xsd:enumeration value="PRIMARY_KEY"/>
-					</xsd:restriction>
-				</xsd:simpleType>
-			</xsd:attribute>
-			<xsd:attribute name="name" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="type" use="optional"
+                default="FUNCTIONAL">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:enumeration value="FUNCTIONAL" />
+                        <xsd:enumeration value="PRIMARY_KEY" />
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:attribute>
+            <xsd:attribute name="name" type="xsd:string"
+                use="optional">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The name of the index.]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="expression" type="xsd:string" use="required"/>
-			<xsd:attribute name="from" type="xsd:string" use="required"/>
-			<xsd:attribute name="imports" type="xsd:string" use="optional"/>
-			<xsd:attribute name="override" type="xsd:string" use="optional" default="true">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="expression" type="xsd:string"
+                use="required" />
+            <xsd:attribute name="from" type="xsd:string"
+                use="required" />
+            <xsd:attribute name="imports" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="override" type="xsd:string"
+                use="optional" default="true">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 Indicates whether the index is created even if there is an index with the same name (default) or not.]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfire-cache">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="cache-ref" type="xsd:string"
+                use="optional" default="gemfire-cache">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The name of the bean defining the GemFire cache (by default 'gemfire-cache').
 					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="pool-name" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="pool-name" type="xsd:string"
+                use="optional">
+                <xsd:annotation>
+                    <xsd:documentation><![CDATA[
 The name of the pool used by the index. Used usually in client scenarios.
 					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-	<!-- Repositories -->
-	<xsd:element name="repositories">
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="repository:repositories">
-					<xsd:sequence>
-						<xsd:element name="repository" type="gemfire-repository" minOccurs="0" maxOccurs="unbounded"/>
-					</xsd:sequence>
-					<xsd:attributeGroup ref="gemfire-repository-attributes"/>
-					<xsd:attributeGroup ref="repository:repository-attributes"/>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-<!-- -->
-	<xsd:complexType name="gemfire-repository">
-		<xsd:complexContent>
-			<xsd:extension base="repository:repository">
-				<xsd:attributeGroup ref="gemfire-repository-attributes"/>
-				<xsd:attributeGroup ref="repository:repository-attributes"/>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-<!-- -->
-	<xsd:attributeGroup name="gemfire-repository-attributes">
-		<xsd:attribute name="gemfire-template-ref" type="gemfireTemplateRef" default="gemfireTemplate">
-			<xsd:annotation>
-				<xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    <!-- Repositories -->
+    <xsd:element name="repositories">
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="repository:repositories">
+                    <xsd:sequence>
+                        <xsd:element name="repository"
+                            type="gemfire-repository" minOccurs="0"
+                            maxOccurs="unbounded" />
+                    </xsd:sequence>
+                    <xsd:attributeGroup ref="gemfire-repository-attributes" />
+                    <xsd:attributeGroup
+                        ref="repository:repository-attributes" />
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+    <!-- -->
+    <xsd:complexType name="gemfire-repository">
+        <xsd:complexContent>
+            <xsd:extension base="repository:repository">
+                <xsd:attributeGroup ref="gemfire-repository-attributes" />
+                <xsd:attributeGroup ref="repository:repository-attributes" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- -->
+    <xsd:attributeGroup name="gemfire-repository-attributes">
+        <xsd:attribute name="gemfire-template-ref" type="gemfireTemplateRef"
+            default="gemfireTemplate">
+            <xsd:annotation>
+                <xsd:documentation>
                     The reference to a GemfireTemplate.
                     Will default to 'gemfireTemplate'.
                 </xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:attributeGroup>
-<!-- -->
-	<xsd:simpleType name="gemfireTemplateRef">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.gemfire.GemfireTemplate"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string"/>
-	</xsd:simpleType>
-<!-- -->
-	<xsd:complexType name="jndiBindingType">
-		<xsd:sequence>
-			<xsd:element name="configProperty" type="configPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:attribute name="jndi-name" type="xsd:string" use="required"/>
-		<xsd:attribute name="type" use="required">
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="ManagedDataSource"/>
-					<xsd:enumeration value="SimpeDataSource"/>
-					<xsd:enumeration value="PooledDataSource"/>
-					<xsd:enumeration value="XaPooledDataSource"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
-		<xsd:attribute name="blocking-timeout-seconds" type="xsd:string" use="optional"/>
-		<xsd:attribute name="conn-pooled-datasource-class" type="xsd:string" use="optional"/>
-		<xsd:attribute name="connection-url" type="xsd:string" use="optional"/>
-		<xsd:attribute name="idle-timeout-seconds" type="xsd:string" use="optional"/>
-		<xsd:attribute name="init-pool-size" type="xsd:string" use="optional"/>
-		<xsd:attribute name="jdbc-driver-class" type="xsd:string" use="optional"/>
-		<xsd:attribute name="login-timeout-seconds" type="xsd:string" use="optional"/>
-		<xsd:attribute name="managed-connection-factory-class" type="xsd:string" use="optional"/>
-		<xsd:attribute name="max-pool-size" type="xsd:string" use="optional"/>
-		<xsd:attribute name="password" type="xsd:string" use="optional"/>
-		<xsd:attribute name="user-name" type="xsd:string" use="optional"/>
-		<xsd:attribute name="xa-datasource-class" type="xsd:string" use="optional"/>
-		<xsd:attribute name="transaction-type" type="xsd:string" use="optional"/>
-	</xsd:complexType>
-<!-- -->
-	<xsd:complexType name="configPropertyType">
-		<xsd:sequence>
-			<xsd:element name="configPropertyName" type="xsd:string"/>
-			<xsd:element name="configPropertyType" type="xsd:string"/>
-			<xsd:element name="configPropertyValue" type="xsd:string"/>
-		</xsd:sequence>
-	</xsd:complexType>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+    <!-- -->
+    <xsd:simpleType name="gemfireTemplateRef">
+        <xsd:annotation>
+            <xsd:appinfo>
+                <tool:annotation kind="ref">
+                    <tool:assignable-to
+                        type="org.springframework.data.gemfire.GemfireTemplate" />
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:union memberTypes="xsd:string" />
+    </xsd:simpleType>
+    <!-- -->
+    <xsd:complexType name="jndiBindingType">
+        <xsd:sequence>
+            <xsd:element name="configProperty" type="configPropertyType"
+                minOccurs="0" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="jndi-name" type="xsd:string"
+            use="required" />
+        <xsd:attribute name="type" use="required">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="ManagedDataSource" />
+                    <xsd:enumeration value="SimpeDataSource" />
+                    <xsd:enumeration value="PooledDataSource" />
+                    <xsd:enumeration value="XaPooledDataSource" />
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="blocking-timeout-seconds"
+            type="xsd:string" use="optional" />
+        <xsd:attribute name="conn-pooled-datasource-class"
+            type="xsd:string" use="optional" />
+        <xsd:attribute name="connection-url" type="xsd:string"
+            use="optional" />
+        <xsd:attribute name="idle-timeout-seconds" type="xsd:string"
+            use="optional" />
+        <xsd:attribute name="init-pool-size" type="xsd:string"
+            use="optional" />
+        <xsd:attribute name="jdbc-driver-class" type="xsd:string"
+            use="optional" />
+        <xsd:attribute name="login-timeout-seconds" type="xsd:string"
+            use="optional" />
+        <xsd:attribute name="managed-connection-factory-class"
+            type="xsd:string" use="optional" />
+        <xsd:attribute name="max-pool-size" type="xsd:string"
+            use="optional" />
+        <xsd:attribute name="password" type="xsd:string"
+            use="optional" />
+        <xsd:attribute name="user-name" type="xsd:string"
+            use="optional" />
+        <xsd:attribute name="xa-datasource-class" type="xsd:string"
+            use="optional" />
+        <xsd:attribute name="transaction-type" type="xsd:string"
+            use="optional" />
+    </xsd:complexType>
+    <!-- -->
+    <xsd:complexType name="configPropertyType">
+        <xsd:sequence>
+            <xsd:element name="configPropertyName" type="xsd:string" />
+            <xsd:element name="configPropertyType" type="xsd:string" />
+            <xsd:element name="configPropertyValue" type="xsd:string" />
+        </xsd:sequence>
+    </xsd:complexType>
 </xsd:schema>
diff --git a/src/test/java/org/springframework/data/gemfire/SubRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/SubRegionFactoryBeanTest.java
deleted file mode 100644
index 0e387e00..00000000
--- a/src/test/java/org/springframework/data/gemfire/SubRegionFactoryBeanTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.springframework.data.gemfire;
-
-import org.junit.Test;
-
-public class SubRegionFactoryBeanTest {
-	@Test
-	public void test() throws Exception {
-		SubRegionFactoryBean srfb = new SubRegionFactoryBean();
-		srfb.setName("child");
-		srfb.afterPropertiesSet();
-		SubRegion sr = srfb.getObject();
-	}
-}
diff --git a/src/test/java/org/springframework/data/gemfire/SubRegionTest.java b/src/test/java/org/springframework/data/gemfire/SubRegionTest.java
new file mode 100644
index 00000000..86177257
--- /dev/null
+++ b/src/test/java/org/springframework/data/gemfire/SubRegionTest.java
@@ -0,0 +1,78 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
+import org.junit.Test;
+
+import com.gemstone.gemfire.cache.GemFireCache;
+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";
+	}
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Test 
+	public void testBasic() throws Exception {
+		CacheFactoryBean cfb = new CacheFactoryBean();
+		cfb.setUseBeanFactoryLocator(false);
+		cfb.afterPropertiesSet();
+		GemFireCache cache = cfb.getObject();
+		RegionFactoryBean rfb = new RegionFactoryBean();
+		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"));
+		
+		cache.close();
+	}
+	@SuppressWarnings("rawtypes")
+	@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());
+	}
+	
+	@SuppressWarnings("rawtypes")
+	@Test 
+	public void testChildOnly() throws Exception {
+		Region child = ctx.getBean("/parent/child", Region.class);
+		assertEquals("/parent/child",child.getFullPath());
+	}
+}
diff --git a/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java
index a943bfc0..415dc7ea 100644
--- a/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/ReplicatedRegionNamespaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * 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.
@@ -18,18 +18,15 @@ package org.springframework.data.gemfire.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.BeanCreationException;
 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.SubRegion;
 import org.springframework.data.gemfire.TestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -90,10 +87,4 @@ public class ReplicatedRegionNamespaceTest {
 		assertEquals("existing", TestUtils.readField("name", lfb));
 		assertEquals(existing, context.getBean("lookup"));
 	}
-	
-	@Test
-	public void testNestedRegions() {
-		Object parent = context.getBean("parent");
-		//SubRegion child = context.getBean("/parent/child", SubRegion.class);
-	}
 }
\ No newline at end of file
diff --git a/src/test/java/org/springframework/data/gemfire/config/SubRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/SubRegionNamespaceTest.java
new file mode 100644
index 00000000..dc7b8c67
--- /dev/null
+++ b/src/test/java/org/springframework/data/gemfire/config/SubRegionNamespaceTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
+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.SubRegionFactoryBean;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheLoader;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+
+/**
+ * @author David Turanski
+ */
+@SuppressWarnings("deprecation")
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("subregion-ns.xml")
+public class SubRegionNamespaceTest {
+
+	@Autowired
+	private ApplicationContext context;
+
+	 
+	
+	@SuppressWarnings("rawtypes")
+	@Test
+	public void testNestedReplicatedRegions() {
+		Region parent = context.getBean("parent",Region.class);
+		Region child = context.getBean("/parent/child", Region.class);
+		Region grandchild = context.getBean("/parent/child/grandchild", Region.class);
+		assertNotNull(child);
+		assertEquals("/parent/child",child.getFullPath());
+		assertSame(child,parent.getSubregion("child"));
+		
+		assertEquals("/parent/child/grandchild",grandchild.getFullPath());
+		assertSame(grandchild,child.getSubregion("grandchild"));
+		
+	}
+	
+	@SuppressWarnings({ "unused", "rawtypes", "unchecked" })
+	@Test
+	public void testMixedNestedRegions() {
+		Cache cache = context.getBean(Cache.class);
+		
+		Region parent = context.getBean("replicatedParent",Region.class);
+		parent.createSubregion("lookupChild",new AttributesFactory().create());
+		
+		Region child = context.getBean("/replicatedParent/lookupChild", Region.class);
+		Region grandchild = context.getBean("/replicatedParent/lookupChild/partitionedGrandchild", Region.class);
+		assertNotNull(child);
+		assertEquals("/replicatedParent/lookupChild",child.getFullPath());
+		assertSame(child,parent.getSubregion("lookupChild"));
+		
+		assertEquals("/replicatedParent/lookupChild/partitionedGrandchild",grandchild.getFullPath());
+		assertSame(grandchild,child.getSubregion("partitionedGrandchild"));
+		
+	}
+	
+	@SuppressWarnings("rawtypes")
+	@Test
+	public void testNestedRegionsWithSiblings() {
+		Region parent = context.getBean("parentWithSiblings",Region.class);
+		Region child1 = context.getBean("/parentWithSiblings/child1",Region.class);
+		assertEquals("/parentWithSiblings/child1",child1.getFullPath());
+		Region child2 = context.getBean("/parentWithSiblings/child2",Region.class);
+		assertEquals("/parentWithSiblings/child2",child2.getFullPath());
+		assertSame(child1,parent.getSubregion("child1"));
+		assertSame(child2,parent.getSubregion("child2"));
+		
+		Region grandchild1 = context.getBean("/parentWithSiblings/child1/grandChild11",Region.class);
+		assertEquals("/parentWithSiblings/child1/grandChild11",grandchild1.getFullPath());
+	}
+	
+	@SuppressWarnings({ "unused", "rawtypes" })
+	@Test
+	public void testComplexNestedRegions() throws Exception {
+		Region parent = context.getBean("complexNested",Region.class);
+		Region child1 = context.getBean("/complexNested/child1",Region.class);
+		Region child2 = context.getBean("/complexNested/child2",Region.class);
+		Region grandchild1 = context.getBean("/complexNested/child1/grandChild11",Region.class);	
+		
+		SubRegionFactoryBean grandchild1fb = context.getBean("&/complexNested/child1/grandChild11",SubRegionFactoryBean.class);	
+		assertNotNull(grandchild1fb);
+		RegionAttributes attr =  grandchild1fb.create();
+		assertNotNull(attr);
+		CacheLoader cl = attr.getCacheLoader();
+		assertNotNull(cl);
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
index 61dc0074..bdaf64ef 100644
--- a/src/test/resources/log4j.properties
+++ b/src/test/resources/log4j.properties
@@ -5,8 +5,8 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
 
 log4j.category.org.springframework.data.gemfire.listener=TRACE
-log4j.category.org.springframework.data.gemfire.repository=DEBUG
-#log4j.category.org.springframework=DEBUG
+log4j.category.org.springframework.data.gemfire=DEBUG
+log4j.category.org.springframework.beans.=DEBUG
 
 # for debugging datasource initialization
 # log4j.category.test.jdbc=DEBUG
diff --git a/src/test/resources/org/springframework/data/gemfire/basic-subregion.xml b/src/test/resources/org/springframework/data/gemfire/basic-subregion.xml
new file mode 100644
index 00000000..ad750a24
--- /dev/null
+++ b/src/test/resources/org/springframework/data/gemfire/basic-subregion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:p="http://www.springframework.org/schema/p"
+    default-lazy-init="true"
+    xmlns:gfe="http://www.springframework.org/schema/gemfire"
+    xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.2.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	
+    <gfe:cache use-bean-factory-locator="false"/>
+    <gfe:replicated-region id="parent"/>
+    <bean name="/parent/child" class="org.springframework.data.gemfire.SubRegionFactoryBean">
+        <property name="parent" ref="parent"/>
+        <property name="regionName" value="child"/>
+    </bean>	
+     
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/subregion-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/subregion-ns.xml
new file mode 100644
index 00000000..d8cf4560
--- /dev/null
+++ b/src/test/resources/org/springframework/data/gemfire/config/subregion-ns.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd" default-lazy-init="true">
+	<gfe:cache />
+    
+    <gfe:replicated-region id="parent">
+        <gfe:replicated-region name="child">
+            <gfe:replicated-region name="grandchild"/> 
+        </gfe:replicated-region>
+    </gfe:replicated-region>
+    
+    
+     <gfe:replicated-region id="replicatedParent">
+        <gfe:lookup-region name="lookupChild">
+            <gfe:partitioned-region name="partitionedGrandchild"/>            
+        </gfe:lookup-region>
+    </gfe:replicated-region>
+    
+     <gfe:replicated-region id="parentWithSiblings">
+        <gfe:replicated-region name="child1">
+            <gfe:replicated-region name="grandChild11"/>
+             <gfe:replicated-region name="grandChild12"/>
+        </gfe:replicated-region>
+        <gfe:replicated-region name="child2"/>
+    </gfe:replicated-region>
+    
+     <gfe:replicated-region id="complexNested">
+       <gfe:cache-listener ref="c-listener"/>
+        <gfe:replicated-region name="child1">
+            <gfe:replicated-region name="grandChild11">
+                <gfe:cache-loader ref="c-loader"/>
+            </gfe:replicated-region>
+             <gfe:replicated-region name="grandChild12"/>
+        </gfe:replicated-region>
+        <gfe:replicated-region name="child2">
+            <gfe:cache-writer ref="c-writer"/>
+        </gfe:replicated-region>
+    </gfe:replicated-region>
+    
+    <bean id="c-listener" class="org.springframework.data.gemfire.SimpleCacheListener"/>
+    <bean id="c-loader" class="org.springframework.data.gemfire.SimpleCacheLoader"/>
+    <bean id="c-writer" class="org.springframework.data.gemfire.SimpleCacheWriter"/>
+    
+</beans>
\ No newline at end of file