From efa6d1cff49760f175b9b0f27139f1bb049909d1 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Wed, 22 Nov 2017 09:54:49 -0800
Subject: [PATCH] SGF-694 - Create SDG XML Namespace schemas (XSDs) for both
 GFE and GFE-DATA.

Set META-INF/spring.schemas appropriately.

Remove all old 1.x SDG XML Namespace schemas (XSDs) and Apache Geode XML Namespace schemas (XSDs).
---
 src/main/resources/META-INF/spring.schemas    |   6 +-
 src/main/resources/META-INF/spring.tooling    |   8 +-
 ...de-1.1.xsd => spring-data-gemfire-2.1.xsd} |  20 +-
 ...g-geode-1.1.xsd => spring-gemfire-2.1.xsd} | 721 +++++++++---------
 4 files changed, 390 insertions(+), 365 deletions(-)
 rename src/main/resources/org/springframework/data/gemfire/config/{spring-data-geode-1.1.xsd => spring-data-gemfire-2.1.xsd} (97%)
 rename src/main/resources/org/springframework/data/gemfire/config/{spring-geode-1.1.xsd => spring-gemfire-2.1.xsd} (98%)

diff --git a/src/main/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas
index c1fd857c..114ca271 100644
--- a/src/main/resources/META-INF/spring.schemas
+++ b/src/main/resources/META-INF/spring.schemas
@@ -1,4 +1,6 @@
 http\://www.springframework.org/schema/gemfire/spring-gemfire-2.0.xsd=org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
-http\://www.springframework.org/schema/gemfire/spring-gemfire.xsd=org/springframework/data/gemfire/config/spring-gemfire-2.0.xsd
+http\://www.springframework.org/schema/gemfire/spring-gemfire-2.1.xsd=org/springframework/data/gemfire/config/spring-gemfire-2.1.xsd
+http\://www.springframework.org/schema/gemfire/spring-gemfire.xsd=org/springframework/data/gemfire/config/spring-gemfire-2.1.xsd
 http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire-2.0.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
-http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-2.0.xsd
+http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire-2.1.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-2.1.xsd
+http\://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd=org/springframework/data/gemfire/config/spring-data-gemfire-2.1.xsd
diff --git a/src/main/resources/META-INF/spring.tooling b/src/main/resources/META-INF/spring.tooling
index 460138cb..3530cb46 100644
--- a/src/main/resources/META-INF/spring.tooling
+++ b/src/main/resources/META-INF/spring.tooling
@@ -1,8 +1,8 @@
-# Tooling related information for the gemfire namespace
-http\://www.springframework.org/schema/gemfire@name=gemfire Namespace
+# Tooling related information for the Spring Data GemFire XML Namespace
+http\://www.springframework.org/schema/gemfire@name=Spring GemFire Namespace
 http\://www.springframework.org/schema/gemfire@prefix=gfe
 http\://www.springframework.org/schema/gemfire@icon=org/springframework/data/gemfire/config/spring-gemfire.gif
 #
-http\://www.springframework.org/schema/data/gemfire@name=Spring data gemfire Namespace
+http\://www.springframework.org/schema/data/gemfire@name=Spring Data GemFire Namespace
 http\://www.springframework.org/schema/data/gemfire@prefix=gfe-data
-http\://www.springframework.org/schema/data/gemfire@icon=org/springframework/data/gemfire/config/spring-gemfire.gif
\ No newline at end of file
+http\://www.springframework.org/schema/data/gemfire@icon=org/springframework/data/gemfire/config/spring-gemfire.gif
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-1.1.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.1.xsd
similarity index 97%
rename from src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-1.1.xsd
rename to src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.1.xsd
index bdd6e7ae..c31ba8a3 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-data-geode-1.1.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.1.xsd
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/data/geode"
-			xmlns:beans="http://www.springframework.org/schema/beans"
+<xsd:schema xmlns="http://www.springframework.org/schema/data/gemfire"
 			xmlns:context="http://www.springframework.org/schema/context"
-			xmlns:gfe="http://www.springframework.org/schema/geode"
+			xmlns:gfe="http://www.springframework.org/schema/gemfire"
 			xmlns:repository="http://www.springframework.org/schema/data/repository"
 			xmlns:tool="http://www.springframework.org/schema/tool"
 			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			targetNamespace="http://www.springframework.org/schema/data/geode"
+			targetNamespace="http://www.springframework.org/schema/data/gemfire"
 			elementFormDefault="qualified"
 			attributeFormDefault="unqualified"
-			version="1.1">
+			version="2.1">
+
 	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
 	<xsd:import namespace="http://www.springframework.org/schema/context"
 				schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
 	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
 				schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
-	<xsd:import namespace="http://www.springframework.org/schema/geode"
-				schemaLocation="http://www.springframework.org/schema/geode/spring-geode.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/gemfire"
+				schemaLocation="http://www.springframework.org/schema/gemfire/spring-gemfire.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+
 	<!-- -->
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -45,7 +46,7 @@
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:attributeGroup>
-	<!-- Mapping -->
+	<!-- -->
 	<xsd:simpleType name="mappingContextRef">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -175,7 +176,7 @@ native GemFire PdxInstance type. True, by default but will incur significant ove
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- Snapshot Service -->
+	<!-- Snapshot Service support -->
 	<xsd:element name="snapshot-service">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -250,4 +251,5 @@ both in the same definition) is illegal.
 		<xsd:attribute name="format" type="xsd:string" use="optional" default="GEMFIRE"/>
 		<xsd:attribute name="filter-ref" type="xsd:string" use="optional"/>
 	</xsd:complexType>
+
 </xsd:schema>
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-1.1.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.1.xsd
similarity index 98%
rename from src/main/resources/org/springframework/data/gemfire/config/spring-geode-1.1.xsd
rename to src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.1.xsd
index 46656697..0961d44f 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-geode-1.1.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-2.1.xsd
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/geode"
-			xmlns:beans="http://www.springframework.org/schema/beans"
-			xmlns:context="http://www.springframework.org/schema/context"
-			xmlns:repository="http://www.springframework.org/schema/data/repository"
+<xsd:schema xmlns="http://www.springframework.org/schema/gemfire"
 			xmlns:tool="http://www.springframework.org/schema/tool"
 			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			targetNamespace="http://www.springframework.org/schema/geode"
+			targetNamespace="http://www.springframework.org/schema/gemfire"
 			elementFormDefault="qualified"
 			attributeFormDefault="unqualified"
-			version="1.1">
+			version="2.1">
+
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
 	<xsd:import namespace="http://www.springframework.org/schema/context" />
 	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+
 	<!-- -->
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -187,6 +186,17 @@ Set the percentage of heap at or above which the cache is considered in danger o
 due to garbage collection pauses or out of memory exceptions. Changing this value can cause a LowMemoryException to
 be thrown during certain cache operation.  This feature requires additional VM flags to perform properly (see the
 JavaDocs for org.apache.geode.cache.control.ResourceManager for more information).
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="critical-off-heap-percentage">
+			<xsd:annotation>
+				<xsd:documentation
+					source="org.apache.geode.cache.control.ResourceManager"><![CDATA[
+Set the percentage of off-heap at or above which the cache is considered in danger of becoming inoperable
+due to out of memory errors. Changing this value can cause LowMemoryException to be thrown. Only one change
+to this attribute or the eviction off-heap percentage will be allowed at any given time and its effect will be
+fully realized before the next change is allowed.
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -197,6 +207,16 @@ JavaDocs for org.apache.geode.cache.control.ResourceManager for more information
 Set the percentage of heap at or above which the eviction should begin on Regions configured for HeapLRU eviction.
 This feature requires additional VM flags to perform properly (see the
 JavaDocs for org.apache.geode.cache.control.ResourceManager for more information).
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="eviction-off-heap-percentage">
+			<xsd:annotation>
+				<xsd:documentation
+					source="org.apache.geode.cache.control.ResourceManager"><![CDATA[
+Set the percentage of off-heap at or above which the eviction should begin on Regions configured for HeapLRU eviction.
+Changing this value may cause eviction to begin immediately. Only one change to this attribute or critical off-heap
+percentage will be allowed at any given time and its effect will be fully realized before the next change is allowed.
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -345,103 +365,6 @@ with Spring configuration meta-data that is specific to the application's needs.
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- Cache Server -->
-	<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="org.apache.geode.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" type="xsd:string" use="optional" default="NONE"/>
-						<xsd:attribute name="capacity" type="xsd:string" use="optional" default="1"/>
-						<xsd:attribute name="disk-store" type="xsd:string" use="optional"/>
-					</xsd:complexType>
-				</xsd:element>
-			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-The name of the cache server definition (by default "gemfireServer").
-				]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfireCache">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-The name of the bean defining the GemFire cache (by default 'gemfireCache').
-					]]></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: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[
-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>
 	<!-- Client Cache Type -->
 	<xsd:element name="client-cache">
 		<xsd:annotation>
@@ -504,68 +427,6 @@ Notifies the server that this durable client is ready to receive updates.
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- Client Pool -->
-	<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="org.apache.geode.cache.client.Pool" />
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:choice>
-				<xsd:element name="locator" type="connectionType" minOccurs="0" maxOccurs="unbounded" />
-				<xsd:element name="server" type="connectionType" minOccurs="0" maxOccurs="unbounded" />
-			</xsd:choice>
-			<xsd:attribute name="id" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-The name of the pool definition (by default "gemfirePool").
-					]]></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="keep-alive" type="xsd:string" use="optional" default="false"/>
-			<xsd:attribute name="locators" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Comma-delimited list of Locator endpoints used by this Pool in the form of: host1[port1],host2[port2],...,hostN[portN]
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<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="servers" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Comma-delimited list of Server endpoints used by this Pool in the form of: host1[port1],host2[port2],...,hostN[portN]
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<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>
 	<!-- Abstract Region Type -->
 	<xsd:complexType name="basicRegionType">
 		<xsd:annotation>
@@ -580,7 +441,7 @@ Comma-delimited list of Server endpoints used by this Pool in the form of: host1
 	<xsd:complexType name="basicSubRegionType">
 		<xsd:complexContent>
 			<xsd:extension base="baseLookupRegionType">
-				<xsd:attribute name="name" type="xsd:string">
+				<xsd:attribute name="name" type="xsd:string" use="required">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 The name of the region definition.]]></xsd:documentation>
@@ -589,7 +450,7 @@ The name of the region definition.]]></xsd:documentation>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<!-- (Auto) Lookup Region Type -->
+	<!-- Lookup Region Type -->
 	<xsd:element name="auto-region-lookup">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -808,7 +669,7 @@ The name of the region definition.
 	</xsd:complexType>
 	<!-- -->
 	<xsd:element name="lookup-region" type="lookupRegionType"/>
-	<!-- Abstract Read-only Region Type -->
+	<!-- -->
 	<xsd:complexType name="baseReadOnlyRegionType" abstract="true">
 		<xsd:complexContent>
 			<xsd:extension base="basicRegionType">
@@ -999,6 +860,15 @@ for the "same" Region (by name), then this can cause confusion or have unexpecte
 						]]></xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
+				<xsd:attribute name="ignore-jta" type="xsd:string" use="optional">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+Indicates whether operations on this Region participates in active JTA transactions or ignores them and operates
+outside of transactions.  This is primarily used in cache loaders, writers, and listeners that need to perform
+non-transactional operations on a Region, such as caching a result set.  GemFire default is false.
+								]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
 				<xsd:attribute name="initial-capacity" type="xsd:string" use="optional">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
@@ -1083,7 +953,7 @@ The name of the region definition.]]>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<!-- Abstract Region Type -->
+	<!-- -->
 	<xsd:complexType name="baseRegionType" abstract="true">
 		<xsd:complexContent>
 			<xsd:extension base="baseReadOnlyRegionType">
@@ -1181,15 +1051,6 @@ use inner bean declarations.
 						</xsd:element>
 					</xsd:choice>
 				</xsd:sequence>
-				<xsd:attribute name="ignore-jta" type="xsd:string" use="optional">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-Indicates whether operations on this Region participates in active JTA transactions or ignores them and operates
-outside of transactions.  This is primarily used in cache loaders, writers, and listeners that need to perform
-non-transactional operations on a Region, such as caching a result set.  GemFire default is false.
-								]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
 				<xsd:attribute name="index-update-type" type="xsd:string" use="optional">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
@@ -1232,7 +1093,7 @@ and the ConcurrentHashMap.  GemFire default is false.
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<!-- Region Template -->
+	<!-- -->
 	<xsd:element name="region-template" type="regionType">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.RegionFactoryBean"><![CDATA[
@@ -1308,7 +1169,7 @@ distributed system with the mcast-port gemfire.properties setting.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:attributeGroup>
-	<!-- Client Region -->
+	<!-- Client Region Type -->
 	<xsd:complexType name="baseClientRegionType" abstract="true">
 		<xsd:annotation>
 			<xsd:documentation
@@ -1537,7 +1398,7 @@ Defines a GemFire Client Region
 			</xsd:appinfo>
 		</xsd:annotation>
 	</xsd:element>
-	<!-- LOCAL Region -->
+	<!-- Local Region Type -->
 	<xsd:complexType name="baseLocalRegionType" abstract="true">
 		<xsd:annotation>
 			<xsd:documentation
@@ -1659,7 +1520,7 @@ Defines a template for creating multiple GemFire Local Regions that all share a
 	</xsd:element>
 	<!-- -->
 	<xsd:element name="local-region" type="localRegionType"/>
-	<!-- PARTITION Region -->
+	<!-- Partition Region Type -->
 	<xsd:complexType name="basePartitionedRegionType" abstract="true">
 		<xsd:annotation>
 			<xsd:documentation
@@ -1944,7 +1805,7 @@ Defines a template for creating multiple GemFire PARTITION Regions that all shar
 	</xsd:element>
 	<!-- -->
 	<xsd:element name="partitioned-region" type="partitionedRegionType"/>
-	<!-- REPLICATE Region -->
+	<!-- Replicate Region Type -->
 	<xsd:complexType name="baseReplicatedRegionType" abstract="true">
 		<xsd:annotation>
 			<xsd:documentation source="org.springframework.data.gemfire.RegionFactoryBean"><![CDATA[
@@ -2097,7 +1958,7 @@ Defines a template for creating multiple GemFire REPLICATE Regions that all shar
 	</xsd:element>
 	<!-- -->
 	<xsd:element name="replicated-region" type="replicatedRegionType"/>
-	<!-- Disk Store -->
+	<!-- Disk Store Type -->
 	<xsd:complexType name="baseDiskStoreType">
 		<xsd:sequence>
 			<xsd:element name="disk-dir" minOccurs="0" maxOccurs="unbounded">
@@ -2226,7 +2087,7 @@ The name of the bean defining the GemFire cache (by default 'gemfireCache').
 		</xsd:complexContent>
 	</xsd:complexType>
 	<!-- -->
-	<xsd:element name="disk-store" type="diskStoreType"/>
+	<xsd:element name="disk-store" type="diskStoreType" />
 	<!-- Eviction -->
 	<xsd:complexType name="evictionType">
 		<xsd:sequence minOccurs="0" maxOccurs="1">
@@ -2300,6 +2161,61 @@ use inner bean declarations.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
+	<!-- Functions -->
+	<xsd:element name="function-service">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="function" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation source="org.apache.geode.cache.execute.Function"><![CDATA[
+Declares one or more remote functions for this cache and register's with them the FunctionService. each bean
+must implement org.apache.geode.cache.execute.Function
+                            ]]></xsd:documentation>
+						<xsd:appinfo>
+							<tool:annotation>
+								<tool:exports type="org.apache.geode.cache.execute.Function" />
+							</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 remote function.
+                                        ]]></xsd:documentation>
+								</xsd:annotation>
+							</xsd:any>
+						</xsd:sequence>
+						<xsd:attribute name="ref" type="xsd:string" use="optional">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+The name of the remote function 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:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The id of the function service (optional)
+                                    ]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+	<!-- Function Annotation support -->
+	<xsd:element name="annotation-driven">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Enables gemfire annotations.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
 	<!-- Index -->
 	<xsd:element name="index">
 		<xsd:annotation>
@@ -2502,7 +2418,269 @@ The name of the bean defining the GemFire cache (by default 'gemfireCache').
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- CQ -->
+	<!-- JNDI -->
+	<xsd:complexType name="jndiBindingType">
+		<xsd:sequence>
+			<xsd:element name="jndi-prop" type="configPropertyType" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Specifies a vendor-specific property
+            ]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="jndi-name" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The JNDI name for this DataSource. Will be prefixed with "java:/"
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="type" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Specifies the DataSource implementation: ManagedDataSource, PooledDataSource, SimpleDataSource, or XAPooledDataSource.
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</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" mixed="true">
+		<xsd:attribute name="key" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Specifies the property key.
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="type" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Specifies the data type if other than java.lang.String.
+            ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+	<!-- Transaction Management (Local Cache) -->
+	<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:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the transaction manager definition (by default "gemfireTransactionManager").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="cache-ref" type="xsd:string" use="optional"
+						   default="gemfireCache">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the bean defining the GemFire cache (by default 'gemfireCache').
+					]]></xsd:documentation>
+				</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>
+	<!-- Client/Server Topology -->
+	<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="org.apache.geode.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" type="xsd:string" use="optional" default="NONE"/>
+						<xsd:attribute name="capacity" type="xsd:string" use="optional" default="1"/>
+						<xsd:attribute name="disk-store" type="xsd:string" use="optional"/>
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the cache server definition (by default "gemfireServer").
+				]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="cache-ref" type="xsd:string" use="optional" default="gemfireCache">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the bean defining the GemFire cache (by default 'gemfireCache').
+					]]></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:complexType>
+	</xsd:element>
+	<!-- -->
+	<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="org.apache.geode.cache.client.Pool" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:choice>
+				<xsd:element name="locator" type="connectionType" minOccurs="0" maxOccurs="unbounded" />
+				<xsd:element name="server" type="connectionType" minOccurs="0" maxOccurs="unbounded" />
+			</xsd:choice>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the pool definition (by default "gemfirePool").
+					]]></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="keep-alive" type="xsd:string" use="optional" default="false"/>
+			<xsd:attribute name="locators" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Comma-delimited list of Locator endpoints used by this Pool in the form of: host1[port1],host2[port2],...,hostN[portN]
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<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="servers" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+Comma-delimited list of Server endpoints used by this Pool in the form of: host1[port1],host2[port2],...,hostN[portN]
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="socket-buffer-size" type="xsd:string" use="optional"/>
+			<xsd:attribute name="statistic-interval" type="xsd:string" use="optional"/>
+			<xsd:attribute name="socket-connect-timeout" 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: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[
+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:element name="cq-listener-container">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -2625,7 +2803,7 @@ Whether the resulting GemFire continuous query is durable or not.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	<!-- Interests -->
+	<!-- -->
 	<xsd:complexType name="interestType" abstract="true">
 		<xsd:attribute name="durable" type="xsd:string" use="optional" default="false">
 			<xsd:annotation>
@@ -2655,164 +2833,7 @@ NONE - Does not initialize the local Cache.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	<!-- Function -->
-	<xsd:element name="function-service">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="function" minOccurs="0" maxOccurs="1">
-					<xsd:annotation>
-						<xsd:documentation source="org.apache.geode.cache.execute.Function"><![CDATA[
-Declares one or more remote functions for this cache and register's with them the FunctionService. each bean
-must implement org.apache.geode.cache.execute.Function
-                            ]]></xsd:documentation>
-						<xsd:appinfo>
-							<tool:annotation>
-								<tool:exports type="org.apache.geode.cache.execute.Function" />
-							</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 remote function.
-                                        ]]></xsd:documentation>
-								</xsd:annotation>
-							</xsd:any>
-						</xsd:sequence>
-						<xsd:attribute name="ref" type="xsd:string" use="optional">
-							<xsd:annotation>
-								<xsd:documentation><![CDATA[
-The name of the remote function 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:sequence>
-			<xsd:attribute name="id" type="xsd:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-The id of the function service (optional)
-                                    ]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-	<!-- Function Annotation Support -->
-	<xsd:element name="annotation-driven">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-	Enables gemfire annotations.
-			]]></xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<!-- JNDI -->
-	<xsd:complexType name="jndiBindingType">
-		<xsd:sequence>
-			<xsd:element name="jndi-prop" type="configPropertyType" minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-Specifies a vendor-specific property
-            ]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="jndi-name" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The JNDI name for this DataSource. Will be prefixed with "java:/"
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="type" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Specifies the DataSource implementation: ManagedDataSource, PooledDataSource, SimpleDataSource, or XAPooledDataSource.
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</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" mixed="true">
-		<xsd:attribute name="key" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Specifies the property key.
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="type" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Specifies the data type if other than java.lang.String.
-            ]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-	<!-- Transaction Management -->
-	<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:string" use="optional">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-The name of the transaction manager definition (by default "gemfireTransactionManager").]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="cache-ref" type="xsd:string" use="optional"
-						   default="gemfireCache">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-The name of the bean defining the GemFire cache (by default 'gemfireCache').
-					]]></xsd:documentation>
-				</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>
-	<!-- WAN -->
+	<!-- WAN Topology -->
 	<xsd:attributeGroup name="commonWANQueueAttributes">
 		<xsd:attribute name="batch-conflation-enabled" type="xsd:string" use="optional">
 			<xsd:annotation>
@@ -2904,7 +2925,7 @@ Boolean value that determines whether GemFire persists the Gateway Queue or Asyn
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:attributeGroup>
-	<!-- AEQ -->
+	<!-- -->
 	<xsd:complexType name="baseAsyncEventQueueType">
 		<xsd:annotation>
 			<xsd:documentation source="org.apache.geode.cache.wan.AsyncEventQueue"><![CDATA[
@@ -2959,7 +2980,6 @@ if an inner bean.
                   ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="forward-expiration-destroy" type="xsd:string" default="false" use="optional"/>
 		<xsd:attributeGroup ref="commonWANQueueAttributes" />
 	</xsd:complexType>
 	<!-- -->
@@ -2986,7 +3006,7 @@ The id of the cache - default is gemfireCache
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-	<!-- Gateway Receiver -->
+	<!-- -->
 	<xsd:complexType name="baseGatewayReceiverType">
 		<xsd:annotation>
 			<xsd:documentation source="org.apache.geode.cache.wan.GatewayReceiver"><![CDATA[
@@ -3070,8 +3090,8 @@ Specifies the socket buffer size in bytes
 		</xsd:attribute>
 	</xsd:complexType>
 	<!-- -->
-	<xsd:element name="gateway-receiver" type="baseGatewayReceiverType"/>
-	<!-- Gateway Sender -->
+	<xsd:element name="gateway-receiver" type="baseGatewayReceiverType" />
+	<!-- -->
 	<xsd:complexType name="baseGatewaySenderType">
 		<xsd:annotation>
 			<xsd:documentation source="org.apache.geode.cache.wan.GatewaySender"><![CDATA[
@@ -3263,4 +3283,5 @@ Used for convenience. If no reference exists, use inner bean declarations.
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
+
 </xsd:schema>