You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/10/11 03:07:33 UTC
[05/20] incubator-geode git commit: GEODE-1914 Removed old dtds from
geode source code(kept 7.0 and above)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/java/org/apache/geode/internal/JarClassLoaderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/JarClassLoaderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/JarClassLoaderJUnitTest.java
index 31a72c8..1961fb2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/JarClassLoaderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/JarClassLoaderJUnitTest.java
@@ -337,7 +337,7 @@ public class JarClassLoaderJUnitTest {
stringBuffer.append("<?xml version=\"1.0\"?>");
stringBuffer.append("<!DOCTYPE cache PUBLIC");
stringBuffer.append(" \"-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN\"");
- stringBuffer.append(" \"http://www.gemstone.com/dtd/cache6_6.dtd\">");
+ stringBuffer.append(" \"http://www.gemstone.com/dtd/cache7_0.dtd\">");
stringBuffer.append("<cache>");
stringBuffer.append(" <function-service>");
stringBuffer.append(" <function>");
@@ -415,7 +415,7 @@ public class JarClassLoaderJUnitTest {
stringBuffer.append("<?xml version=\"1.0\"?>");
stringBuffer.append("<!DOCTYPE cache PUBLIC");
stringBuffer.append(" \"-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN\"");
- stringBuffer.append(" \"http://www.gemstone.com/dtd/cache6_6.dtd\">");
+ stringBuffer.append(" \"http://www.gemstone.com/dtd/cache7_0.dtd\">");
stringBuffer.append("<cache>");
stringBuffer.append(" <function-service>");
stringBuffer.append(" <function>");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
index 21accef..f2ba355 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
@@ -147,8 +147,8 @@ public class PdxSerializableJUnitTest {
PrintWriter pw = new PrintWriter(new OutputStreamWriter(baos), true);
pw.println("<?xml version=\"1.0\"?>");
pw.println("<!DOCTYPE cache PUBLIC");
- pw.println(" \"-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN\"");
- pw.println(" \"http://www.gemstone.com/dtd/cache6_6.dtd\">");
+ pw.println(" \"-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN\"");
+ pw.println(" \"http://www.gemstone.com/dtd/cache7_0.dtd\">");
pw.println("<cache>");
pw.println(" <disk-store name=\"r2DS\"/>");
pw.println(" <disk-store name=\"pdxDS\"/>");
@@ -224,8 +224,8 @@ public class PdxSerializableJUnitTest {
PrintWriter pw = new PrintWriter(new OutputStreamWriter(baos), true);
pw.println("<?xml version=\"1.0\"?>");
pw.println("<!DOCTYPE cache PUBLIC");
- pw.println(" \"-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN\"");
- pw.println(" \"http://www.gemstone.com/dtd/cache6_6.dtd\">");
+ pw.println(" \"-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN\"");
+ pw.println(" \"http://www.gemstone.com/dtd/cache7_0.dtd\">");
pw.println("<cache>");
pw.println(" <disk-store name=\"r2DS\"/>");
pw.println(" <pdx persistent=\"true\"/>");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/jta/cachejta.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/jta/cachejta.xml b/geode-core/src/test/resources/jta/cachejta.xml
index 9a36ee6..40d0a7b 100644
--- a/geode-core/src/test/resources/jta/cachejta.xml
+++ b/geode-core/src/test/resources/jta/cachejta.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.0//EN"
- "http://www.gemstone.com/dtd/cache6_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300">
<vm-root-region name="root">
<region-attributes scope="distributed-no-ack" data-policy="normal" initial-capacity="16" load-factor="0.75" concurrency-level="16" statistics-enabled="true">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml b/geode-core/src/test/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
index 92454c4..2a7e8f4 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
@@ -21,8 +21,8 @@
region's pool connects to a server listening on port 40404.
-->
<!DOCTYPE client-cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN"
- "http://www.gemstone.com/dtd/cache6_5.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<client-cache>
<pool name="my_pool_name" multiuser-authentication="true">
<server host="localhost" port="40404"/>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-with-eviction.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-with-eviction.xml b/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-with-eviction.xml
index 861bb23..f963969 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-with-eviction.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-with-eviction.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN"
- "http://www.gemstone.com/dtd/cache6_6.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- Used in IndexCreationTest.testIndexCreationFromXML, this defines a persistent
region with an index and and eviction -->
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-without-eviction.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-without-eviction.xml b/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-without-eviction.xml
index f8bdc78..f615984 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-without-eviction.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-without-eviction.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN"
- "http://www.gemstone.com/dtd/cache6_6.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- Used in IndexCreationTest.testIndexCreationFromXML, this defines a persistent
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-recovery-overflow.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-recovery-overflow.xml b/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-recovery-overflow.xml
index 4ca5e2f..5fc12c8 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-recovery-overflow.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-recovery-overflow.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN"
- "http://www.gemstone.com/dtd/cache6_6.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- Used in IndexCreationTest.testIndexCreationFromXML, this defines a persistent
region with an index and and eviction -->
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache/query/internal/index/cachequeryindex.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache/query/internal/index/cachequeryindex.xml b/geode-core/src/test/resources/org/apache/geode/cache/query/internal/index/cachequeryindex.xml
index ebcc0a4..771b189 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache/query/internal/index/cachequeryindex.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache/query/internal/index/cachequeryindex.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN" "http://www.gemstone.com/dtd/cache6_6.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300">
<vm-root-region name="root">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache/query/internal/index/cachequeryindexwitherror.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache/query/internal/index/cachequeryindexwitherror.xml b/geode-core/src/test/resources/org/apache/geode/cache/query/internal/index/cachequeryindexwitherror.xml
index caa3cc9..4d8f631 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache/query/internal/index/cachequeryindexwitherror.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache/query/internal/index/cachequeryindexwitherror.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN" "http://www.gemstone.com/dtd/cache6_6.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300">
<vm-root-region name="root">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache/query/partitioned/PRIndexCreation.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache/query/partitioned/PRIndexCreation.xml b/geode-core/src/test/resources/org/apache/geode/cache/query/partitioned/PRIndexCreation.xml
index 4236a7d..6686c1c 100755
--- a/geode-core/src/test/resources/org/apache/geode/cache/query/partitioned/PRIndexCreation.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache/query/partitioned/PRIndexCreation.xml
@@ -16,11 +16,11 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 5.1//EN" "http://www.gemstone.com/dtd/cache5_1.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300" is-server="false" copy-on-read="false">
<cache-transaction-manager/>
<region name="PartionedPortfolios">
- <region-attributes early-ack="false" multicast-enabled="false" publisher="false" enable-async-conflation="false" enable-bridge-conflation="false" enable-gateway="false" data-policy="partition" initial-capacity="16" load-factor="0.75" concurrency-level="16" statistics-enabled="false" ignore-jta="false" is-lock-grantor="false">
+ <region-attributes early-ack="false" multicast-enabled="false" publisher="false" enable-async-conflation="false" enable-gateway="false" data-policy="partition" initial-capacity="16" load-factor="0.75" concurrency-level="16" statistics-enabled="false" ignore-jta="false" is-lock-grantor="false">
<value-constraint>org.apache.geode.cache.query.data.PortfolioData</value-constraint>
<region-time-to-live>
<expiration-attributes timeout="0" action="invalidate"/>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/attributesUnordered.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/attributesUnordered.xml b/geode-core/src/test/resources/org/apache/geode/cache30/attributesUnordered.xml
index aa8c3f4..152ca4e 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/attributesUnordered.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/attributesUnordered.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.0//EN"
- "http://www.gemstone.com/dtd/cache4_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- Tests whether or not XML attributes can appear in any order (see
bug 30050) -->
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/badFloat.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/badFloat.xml b/geode-core/src/test/resources/org/apache/geode/cache30/badFloat.xml
index 883216c..a2fa1cd 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/badFloat.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/badFloat.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.0//EN"
- "http://www.gemstone.com/dtd/cache4_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- This file contains a malformed float -->
@@ -27,4 +27,4 @@
<region-attributes load-factor="BAD">
</region-attributes>
</vm-root-region>
-</cache>
\ No newline at end of file
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/badInt.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/badInt.xml b/geode-core/src/test/resources/org/apache/geode/cache30/badInt.xml
index 17f9aa1..96b7f0e 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/badInt.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/badInt.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.0//EN"
- "http://www.gemstone.com/dtd/cache4_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- This file has a malformed integer -->
@@ -30,4 +30,4 @@
</entry-idle-time>
</region-attributes>
</vm-root-region>
-</cache>
\ No newline at end of file
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/badKeyConstraintClass.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/badKeyConstraintClass.xml b/geode-core/src/test/resources/org/apache/geode/cache30/badKeyConstraintClass.xml
index 9aa8cb3..d11d75c 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/badKeyConstraintClass.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/badKeyConstraintClass.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.0//EN"
- "http://www.gemstone.com/dtd/cache4_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- This class references a non-existent key constraint class -->
@@ -28,4 +28,4 @@
<key-constraint>blah.blah.Blah</key-constraint>
</region-attributes>
</vm-root-region>
-</cache>
\ No newline at end of file
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/badScope.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/badScope.xml b/geode-core/src/test/resources/org/apache/geode/cache30/badScope.xml
index 0744a72..8fa455d 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/badScope.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/badScope.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.0//EN"
- "http://www.gemstone.com/dtd/cache4_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- This file has a bad scope -->
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/callbackNotDeclarable.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/callbackNotDeclarable.xml b/geode-core/src/test/resources/org/apache/geode/cache30/callbackNotDeclarable.xml
index fb3cf9c..b7abdde 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/callbackNotDeclarable.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/callbackNotDeclarable.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.0//EN"
- "http://www.gemstone.com/dtd/cache4_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- Has a callback (cache loader) that does not implement Declarable
-->
@@ -27,8 +27,8 @@
<vm-root-region name="root">
<region-attributes>
<cache-listener>
- <class-name>org.apache.geode.cache30.CacheXml30DUnitTest$NotDeclarableCacheListener</class-name>
+ <class-name>org.apache.geode.cache30.CacheXml66DUnitTest$NotDeclarableCacheListener</class-name>
</cache-listener>
</region-attributes>
</vm-root-region>
-</cache>
\ No newline at end of file
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/callbackWithException.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/callbackWithException.xml b/geode-core/src/test/resources/org/apache/geode/cache30/callbackWithException.xml
index 4a39cc1..241ec1e 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/callbackWithException.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/callbackWithException.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.0//EN"
- "http://www.gemstone.com/dtd/cache4_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- Has a callback (cache listener) whose constructor throws an
exception -->
@@ -27,8 +27,8 @@ exception -->
<vm-root-region name="root">
<region-attributes>
<cache-listener>
- <class-name>org.apache.geode.cache30.CacheXml30DUnitTest$ExceptionalCacheListener</class-name>
+ <class-name>org.apache.geode.cache30.CacheXml66DUnitTest$ExceptionalCacheListener</class-name>
</cache-listener>
</region-attributes>
</vm-root-region>
-</cache>
\ No newline at end of file
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/coLocation.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/coLocation.xml b/geode-core/src/test/resources/org/apache/geode/cache30/coLocation.xml
index 6c23d5f..6364b62 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/coLocation.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/coLocation.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Cache 5.8//EN" "http://www.gemstone.com/dtd/cache5_8.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Cache 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
<region name="Customer">
<region-attributes data-policy="partition">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/ewtest.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/ewtest.xml b/geode-core/src/test/resources/org/apache/geode/cache30/ewtest.xml
index 1f40036..e4b4654 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/ewtest.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/ewtest.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN" "http://www.gemstone.com/dtd/cache6_5.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300">
<!-- Disk store declarations -->
<disk-store name="persistentDiskStore1"
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/examples_3_0/example-cache.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/examples_3_0/example-cache.xml b/geode-core/src/test/resources/org/apache/geode/cache30/examples_3_0/example-cache.xml
index f7bdc8e..7b9f73f 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/examples_3_0/example-cache.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/examples_3_0/example-cache.xml
@@ -19,8 +19,8 @@
<!-- A sample GemFire declarative caching XML File -->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 3.0//EN"
- "http://www.gemstone.com/dtd/cache3_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache search-timeout="60" lock-lease="300">
<vm-root-region name="root">
<region-attributes/>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/examples_4_0/example-cache.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/examples_4_0/example-cache.xml b/geode-core/src/test/resources/org/apache/geode/cache30/examples_4_0/example-cache.xml
index 4b21e8f..e0dcd67 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/examples_4_0/example-cache.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/examples_4_0/example-cache.xml
@@ -19,8 +19,8 @@
<!-- A sample GemFire declarative caching XML File -->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 5.1//EN"
- "http://www.gemstone.com/dtd/cache5_1.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache search-timeout="60" lock-lease="300" copy-on-read="true">
<region name="root">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/loaderNotLoader.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/loaderNotLoader.xml b/geode-core/src/test/resources/org/apache/geode/cache30/loaderNotLoader.xml
index c7fec6f..50c2829 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/loaderNotLoader.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/loaderNotLoader.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.0//EN"
- "http://www.gemstone.com/dtd/cache4_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- Specifies a cache loader that is not a cache loader -->
@@ -26,8 +26,8 @@
<vm-root-region name="root">
<region-attributes>
<cache-loader>
- <class-name>org.apache.geode.cache30.CacheXml30DUnitTest$MyTestCacheWriter</class-name>
+ <class-name>org.apache.geode.cache30.CacheXml66DUnitTest$MyTestCacheWriter</class-name>
</cache-loader>
</region-attributes>
</vm-root-region>
-</cache>
\ No newline at end of file
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/malformed.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/malformed.xml b/geode-core/src/test/resources/org/apache/geode/cache30/malformed.xml
index 8052ba5..ad39f8b 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/malformed.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/malformed.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.0//EN"
- "http://www.gemstone.com/dtd/cache4_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- This file is malformed -->
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/namedAttributes.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/namedAttributes.xml b/geode-core/src/test/resources/org/apache/geode/cache30/namedAttributes.xml
index 2d3b4a5..18b6cd8 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/namedAttributes.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/namedAttributes.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.1//EN"
- "http://www.gemstone.com/dtd/cache4_1.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- This file contains a region created with a named attribute -->
@@ -56,4 +56,4 @@
</region-attributes>
</region>
</vm-root-region>
-</cache>
\ No newline at end of file
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/partitionedRegion.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/partitionedRegion.xml b/geode-core/src/test/resources/org/apache/geode/cache30/partitionedRegion.xml
index 773cb7b..6bdf710 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/partitionedRegion.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/partitionedRegion.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 5.0//EN"
- "http://www.gemstone.com/dtd/cache5_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
<vm-root-region name="pRoot">
<region-attributes >
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/partitionedRegion51.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/partitionedRegion51.xml b/geode-core/src/test/resources/org/apache/geode/cache30/partitionedRegion51.xml
index 826e500..8f059c7 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/partitionedRegion51.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/partitionedRegion51.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 5.1//EN"
- "http://www.gemstone.com/dtd/cache5_1.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
<vm-root-region name="pRoot">
<region-attributes data-policy="partition">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/sameRootRegion.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/sameRootRegion.xml b/geode-core/src/test/resources/org/apache/geode/cache30/sameRootRegion.xml
index f34061a..e634f14 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/sameRootRegion.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/sameRootRegion.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.1//EN"
- "http://www.gemstone.com/dtd/cache4_1.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- This file contains a cache with the same root region declared
twice -->
@@ -34,4 +34,4 @@
<value-constraint>java.lang.String</value-constraint>
</region-attributes>
</vm-root-region>
-</cache>
\ No newline at end of file
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/sameSubregion.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/sameSubregion.xml b/geode-core/src/test/resources/org/apache/geode/cache30/sameSubregion.xml
index 26f95bb..8abd627 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/sameSubregion.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/sameSubregion.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.1//EN"
- "http://www.gemstone.com/dtd/cache4_1.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- This file contains a cache with the same root region declared
twice -->
@@ -39,4 +39,4 @@
</region-attributes>
</region>
</vm-root-region>
-</cache>
\ No newline at end of file
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache30/unknownNamedAttributes.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/cache30/unknownNamedAttributes.xml b/geode-core/src/test/resources/org/apache/geode/cache30/unknownNamedAttributes.xml
index 7e570e8..11241b2 100644
--- a/geode-core/src/test/resources/org/apache/geode/cache30/unknownNamedAttributes.xml
+++ b/geode-core/src/test/resources/org/apache/geode/cache30/unknownNamedAttributes.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.1//EN"
- "http://www.gemstone.com/dtd/cache4_1.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<!-- This file contains a region created with an unknown named
attribute -->
@@ -27,4 +27,4 @@
<vm-root-region name="root">
<region-attributes refid="unknown"/>
</vm-root-region>
-</cache>
\ No newline at end of file
+</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/BackupJUnitTest.cache.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/BackupJUnitTest.cache.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/BackupJUnitTest.cache.xml
index 01570f4..30a8497 100644
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/BackupJUnitTest.cache.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/BackupJUnitTest.cache.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 5.1//EN" "http://www.gemstone.com/dtd/cache5_1.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
<!-- nothing special here, we just want to make sure this file gets backed up, byte for byte. -->
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.xml
index b6818d0..3b3ec5f 100644
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.xml
@@ -23,8 +23,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN"
- "http://www.gemstone.com/dtd/cache6_5.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
<disk-store name="ds1" auto-compact="true" max-oplog-size="2">
<disk-dirs>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/PartitionRegionCacheExample1.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/PartitionRegionCacheExample1.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/PartitionRegionCacheExample1.xml
index d1b5d11..c35398f 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/PartitionRegionCacheExample1.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/PartitionRegionCacheExample1.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 5.1//EN" "http://www.gemstone.com/dtd/cache5_1.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
<!-- Create a new root region as partition region -->
<vm-root-region name="firstPartitionRegion">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/PartitionRegionCacheExample2.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/PartitionRegionCacheExample2.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/PartitionRegionCacheExample2.xml
index 4eda72a..f2a2c24 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/PartitionRegionCacheExample2.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/PartitionRegionCacheExample2.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 5.1//EN" "http://www.gemstone.com/dtd/cache5_1.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache search-timeout="60" lock-lease="300">
<region name="root">
<region-attributes/>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_bytes_threshold.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_bytes_threshold.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_bytes_threshold.xml
index b734ce1..d80b9ac 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_bytes_threshold.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_bytes_threshold.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN" "http://www.gemstone.com/dtd/cache6_5.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300" is-server="false" copy-on-read="false">
<cache-transaction-manager/>
<disk-store name="ds1" auto-compact="false" max-oplog-size="10000" time-interval="15" queue-size="-1">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_dir.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_dir.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_dir.xml
index 71aba12..7897cc8 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_dir.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_dir.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN" "http://www.gemstone.com/dtd/cache6_5.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300" is-server="false" copy-on-read="false">
<cache-transaction-manager/>
<disk-store name="ds1" auto-compact="false" max-oplog-size="10000" time-interval="15" queue-size="0">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_dir_size.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_dir_size.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_dir_size.xml
index a03139f..9ef605b 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_dir_size.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_dir_size.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN" "http://www.gemstone.com/dtd/cache6_5.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300" is-server="false" copy-on-read="false">
<cache-transaction-manager/>
<disk-store name="ds1" auto-compact="false" max-oplog-size="10000" time-interval="15" queue-size="0">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_max_oplog_size.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_max_oplog_size.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_max_oplog_size.xml
index 71dc62f..328b2bb 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_max_oplog_size.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_max_oplog_size.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN" "http://www.gemstone.com/dtd/cache6_5.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300" is-server="false" copy-on-read="false">
<cache-transaction-manager/>
<disk-store name="ds1" auto-compact="false" max-oplog-size="-1" time-interval="15" queue-size="0">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_roll_oplogs_value.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_roll_oplogs_value.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_roll_oplogs_value.xml
index f3d8594..87006cd 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_roll_oplogs_value.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_roll_oplogs_value.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN" "http://www.gemstone.com/dtd/cache6_5.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300" is-server="false" copy-on-read="false">
<cache-transaction-manager/>
<disk-store name="ds1" auto-compact="crap" max-oplog-size="10000" time-interval="15" queue-size="0">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_sync_value.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_sync_value.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_sync_value.xml
index 990fa24..ab77c08 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_sync_value.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_sync_value.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN" "http://www.gemstone.com/dtd/cache6_5.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300" is-server="false" copy-on-read="false">
<cache-transaction-manager/>
<disk-store name="ds1" auto-compact="false" max-oplog-size="10000" time-interval="15" queue-size="0">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_time_interval.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_time_interval.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_time_interval.xml
index a55b690..991c8b4 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_time_interval.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/incorrect_time_interval.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN" "http://www.gemstone.com/dtd/cache6_5.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300" is-server="false" copy-on-read="false">
<cache-transaction-manager/>
<disk-store name="ds1" auto-compact="false" max-oplog-size="10000" time-interval="-15" queue-size="0">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/mixed_diskstore_diskdir.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/mixed_diskstore_diskdir.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/mixed_diskstore_diskdir.xml
index 6fcb012..578769e 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/mixed_diskstore_diskdir.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/mixed_diskstore_diskdir.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN" "http://www.gemstone.com/dtd/cache6_5.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300" is-server="false" copy-on-read="false">
<cache-transaction-manager/>
<disk-store name="ds1" auto-compact="false" max-oplog-size="10000" time-interval="15" queue-size="0">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/mixed_diskstore_diskwriteattrs.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/mixed_diskstore_diskwriteattrs.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/mixed_diskstore_diskwriteattrs.xml
index 6d23a22..49a1e40 100755
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/mixed_diskstore_diskwriteattrs.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/faultyDiskXMLsForTesting/mixed_diskstore_diskwriteattrs.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN" "http://www.gemstone.com/dtd/cache6_5.dtd">
+<!DOCTYPE cache PUBLIC "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN" "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="60" search-timeout="300" is-server="false" copy-on-read="false">
<cache-transaction-manager/>
<disk-store name="ds1" auto-compact="false" max-oplog-size="10000" time-interval="15" queue-size="0">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.testDTDFallbackWithNonEnglishLocal.cache.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.testDTDFallbackWithNonEnglishLocal.cache.xml b/geode-core/src/test/resources/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.testDTDFallbackWithNonEnglishLocal.cache.xml
index 7fb89e4..6609694 100644
--- a/geode-core/src/test/resources/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.testDTDFallbackWithNonEnglishLocal.cache.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.testDTDFallbackWithNonEnglishLocal.cache.xml
@@ -17,7 +17,7 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN"
- "http://www.gemstone.com/dtd/cache6_5.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache>
</cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/internal/jta/cachejta.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/internal/jta/cachejta.xml b/geode-core/src/test/resources/org/apache/geode/internal/jta/cachejta.xml
index d31a634..7d8d6ec 100644
--- a/geode-core/src/test/resources/org/apache/geode/internal/jta/cachejta.xml
+++ b/geode-core/src/test/resources/org/apache/geode/internal/jta/cachejta.xml
@@ -17,11 +17,11 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 4.1//EN"
- "http://www.gemstone.com/dtd/cache4_1.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache lock-lease="120" lock-timeout="120" search-timeout="300">
<vm-root-region name="root">
- <region-attributes scope="distributed-no-ack" mirror-type="none" keep-alive-timeout="0" initial-capacity="16" load-factor="0.75" concurrency-level="16" statistics-enabled="true">
+ <region-attributes scope="distributed-no-ack" mirror-type="none" initial-capacity="16" load-factor="0.75" concurrency-level="16" statistics-enabled="true">
<region-time-to-live>
<expiration-attributes timeout="0" action="invalidate"/>
</region-time-to-live>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-cq/src/test/resources/org/apache/geode/internal/cache/tier/sockets/durablecq-client-cache.xml
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/resources/org/apache/geode/internal/cache/tier/sockets/durablecq-client-cache.xml b/geode-cq/src/test/resources/org/apache/geode/internal/cache/tier/sockets/durablecq-client-cache.xml
index bd84207..c8fb36b 100644
--- a/geode-cq/src/test/resources/org/apache/geode/internal/cache/tier/sockets/durablecq-client-cache.xml
+++ b/geode-cq/src/test/resources/org/apache/geode/internal/cache/tier/sockets/durablecq-client-cache.xml
@@ -16,8 +16,8 @@
limitations under the License.
-->
<!DOCTYPE client-cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN"
- "http://www.gemstone.com/dtd/cache6_6.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<client-cache>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-cq/src/test/resources/org/apache/geode/internal/cache/tier/sockets/durablecq-server-cache.xml
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/resources/org/apache/geode/internal/cache/tier/sockets/durablecq-server-cache.xml b/geode-cq/src/test/resources/org/apache/geode/internal/cache/tier/sockets/durablecq-server-cache.xml
index 0f21721..c3f64b9 100644
--- a/geode-cq/src/test/resources/org/apache/geode/internal/cache/tier/sockets/durablecq-server-cache.xml
+++ b/geode-cq/src/test/resources/org/apache/geode/internal/cache/tier/sockets/durablecq-server-cache.xml
@@ -16,8 +16,8 @@
limitations under the License.
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN"
- "http://www.gemstone.com/dtd/cache6_6.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd">
<cache is-server="true">
<!-- Define this cache server -->
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-spark-connector/geode-spark-connector/src/it/resources/test-regions.xml
----------------------------------------------------------------------
diff --git a/geode-spark-connector/geode-spark-connector/src/it/resources/test-regions.xml b/geode-spark-connector/geode-spark-connector/src/it/resources/test-regions.xml
index 79893d6..b92c1f3 100644
--- a/geode-spark-connector/geode-spark-connector/src/it/resources/test-regions.xml
+++ b/geode-spark-connector/geode-spark-connector/src/it/resources/test-regions.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN"
- "http://www.gemstone.com/dtd/cache6_5.dtd" >
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd" >
<cache>
<!-- test region for OQL test -->
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-spark-connector/geode-spark-connector/src/it/resources/test-retrieve-regions.xml
----------------------------------------------------------------------
diff --git a/geode-spark-connector/geode-spark-connector/src/it/resources/test-retrieve-regions.xml b/geode-spark-connector/geode-spark-connector/src/it/resources/test-retrieve-regions.xml
index 3023959..911a65d 100644
--- a/geode-spark-connector/geode-spark-connector/src/it/resources/test-retrieve-regions.xml
+++ b/geode-spark-connector/geode-spark-connector/src/it/resources/test-retrieve-regions.xml
@@ -17,8 +17,8 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.5//EN"
- "http://www.gemstone.com/dtd/cache6_5.dtd" >
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+ "http://www.gemstone.com/dtd/cache7_0.dtd" >
<cache>
<!-- combinations of key, value types with region types -->