From c5707da779f119e173f15c29f544fbd9db96295a Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Tue, 18 Jun 2019 11:10:34 -0700
Subject: [PATCH] DATAGEODE-204 - Replace all cache.xml document schema
 declarations referring to the DTD to use the XSD.

---
 src/test/resources/cache-with-declarable.xml    |  2 +-
 src/test/resources/clientcache-with-regions.xml |  6 +++---
 src/test/resources/gemfire-cache.xml            | 14 ++++++++++----
 src/test/resources/gemfire-client-cache.xml     |  6 ++----
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/test/resources/cache-with-declarable.xml b/src/test/resources/cache-with-declarable.xml
index 3b5f244a..e99ee18a 100644
--- a/src/test/resources/cache-with-declarable.xml
+++ b/src/test/resources/cache-with-declarable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<region name="Example">
diff --git a/src/test/resources/clientcache-with-regions.xml b/src/test/resources/clientcache-with-regions.xml
index e640016c..384c4ee8 100644
--- a/src/test/resources/clientcache-with-regions.xml
+++ b/src/test/resources/clientcache-with-regions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <client-cache xmlns="http://geode.apache.org/schema/cache"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-	   version="1.0">
+			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			  xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
+			  version="1.0">
 
 	<region name="NativeClientRegion" refid="LOCAL">
 		<region-attributes cloning-enabled="false"/>
diff --git a/src/test/resources/gemfire-cache.xml b/src/test/resources/gemfire-cache.xml
index 22b1f636..bb3af478 100644
--- a/src/test/resources/gemfire-cache.xml
+++ b/src/test/resources/gemfire-cache.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-	   version="1.0" lock-lease="120" lock-timeout="60" search-timeout="300">
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   version="1.0"
+	   lock-lease="120" lock-timeout="60" search-timeout="300">
 
-	<region-attributes id="attTemplate" scope="local" data-policy="normal" initial-capacity="16" load-factor="0.75"
-					   concurrency-level="16" statistics-enabled="true">
+	<region-attributes id="attTemplate"
+					   concurrency-level="16"
+					   data-policy="normal"
+					   initial-capacity="16"
+					   load-factor="0.75"
+					   scope="local"
+					   statistics-enabled="true">
 		<key-constraint>java.lang.String</key-constraint>
 	</region-attributes>
 
diff --git a/src/test/resources/gemfire-client-cache.xml b/src/test/resources/gemfire-client-cache.xml
index cee08e60..273985d4 100644
--- a/src/test/resources/gemfire-client-cache.xml
+++ b/src/test/resources/gemfire-client-cache.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <client-cache xmlns="http://geode.apache.org/schema/cache"
 			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			  xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+			  xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 			  version="1.0">
 
 	<pool name="DEFAULT">
-		<locator host="localhost" port="1234"/>
+		<locator port="1234" host="localhost"/>
 	</pool>
 
 	<region name="myRegion" refid="PROXY"/>
-	<!-- you can override or add to the PROXY attributes by adding a region-attributes sub element here -->
 
 </client-cache>
-