geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [46/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:25 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/serialEntryEventWithRegInterest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/serialEntryEventWithRegInterest.xml b/src/tests/cpp/xml/CqQuery/serialEntryEventWithRegInterest.xml
deleted file mode 100644
index 4a926e6..0000000
--- a/src/tests/cpp/xml/CqQuery/serialEntryEventWithRegInterest.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEventWithRegInterest" description="cq test with register interest">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH CqQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Register And execute CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="registerAndExecuteCQs">true</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="UpdateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set count="2" name="ThinClient"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="querytests" waitTime="15m">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroysKeys" container="perftests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys">
-      <list>
-        <item>100</item>
-      </list>
-  </data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set count="2" name="ThinClient"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="querytests" waitTime="15m">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="querytests" waitTime="10m">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="querytests" waitTime="15m">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroysKeys" container="perftests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="destroy region" action="doDestroyRegion" container="perftests" waitTime="2m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ removed " action="doVerifyCqDestroyed" container="querytests" waitTime="5m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml b/src/tests/cpp/xml/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
deleted file mode 100644
index 2269333..0000000
--- a/src/tests/cpp/xml/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="cq">true</data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-    </list>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">        
-        <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialMultRegOpsCQListenerWithFeeder" description="cq with multiregion test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="querytests" waitTime="15m">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>1000</item>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="querytests" waitTime="15m">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-          <item>1000</item>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="querytests" waitTime="15m">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>1000</item>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="cacheserver" waitTime="5m">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>putAll</item>
-          <item>update</item>
-          <item>removeAll</item>
-          <item>update</item>
-          <item>putAllCB</item>
-          <item>destroy</item>
-          <item>removeAllCB</item>
-        </oneof>
-      </data>
-      <data name="workTime">1m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/serverFailoverAndCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/serverFailoverAndCQOps.xml b/src/tests/cpp/xml/CqQuery/serverFailoverAndCQOps.xml
deleted file mode 100644
index 2419d2b..0000000
--- a/src/tests/cpp/xml/CqQuery/serverFailoverAndCQOps.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serverFailoverAndCQOps" description="failover test with single region">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="querytests" waitTime="15m" parallel="true">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">7m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="cacheserver" waitTime="15m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/singleRegCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/singleRegCQOps.xml b/src/tests/cpp/xml/CqQuery/singleRegCQOps.xml
deleted file mode 100644
index 590850a..0000000
--- a/src/tests/cpp/xml/CqQuery/singleRegCQOps.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="singleRegCQOps" description="single region cq operations test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="querytests" waitTime="15m" parallel="true">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="cacheserver" waitTime="15m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/cacheserver_with_deltaobj.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/cacheserver_with_deltaobj.xml b/src/tests/cpp/xml/Delta/cacheserver_with_deltaobj.xml
deleted file mode 100644
index e0b52c2..0000000
--- a/src/tests/cpp/xml/Delta/cacheserver_with_deltaobj.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-
-<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">
-	<!--cache-server host="cod" port="24680" /-->
-	<cache-server port="$PORT_NUM"/>
-
-	<region name="TestTCR1">
-		<region-attributes scope="distributed-ack" data-policy="replicate"/>
-		<entry>
-                <key><string>delta1-1</string></key>
-                <value>
-                  <declarable>
-                    <class-name>javaobject.DeltaTestImpl</class-name>
-                  </declarable>
-                </value>
-         </entry>
-	</region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/csDeltaEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/csDeltaEviction.xml b/src/tests/cpp/xml/Delta/csDeltaEviction.xml
deleted file mode 100755
index 79186cc..0000000
--- a/src/tests/cpp/xml/Delta/csDeltaEviction.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-
-<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">
-  <cache-server port="$PORT_NUM"/>
-  <region name="dummy">
-    <region-attributes data-policy="partition" cloning-enabled="true">
-       <partition-attributes total-num-buckets="2" redundant-copies="1"/> 
-       <eviction-attributes>
-          <lru-entry-count maximum="45" action="overflow-to-disk"/>
-       </eviction-attributes>
-    </region-attributes>
-    <entry>
-      <key><string>delta1-1</string></key>
-      <value>
-        <declarable>
-           <class-name>javaobject.DeltaTestImpl</class-name>
-        </declarable>
-      </value>
-    </entry>
-  </region>
-    <region name="TestTCR1">
-    <region-attributes data-policy="partition" cloning-enabled="true">
-       <partition-attributes total-num-buckets="2" redundant-copies="1"/> 
-       <eviction-attributes>
-          <lru-entry-count maximum="45" action="overflow-to-disk"/>
-       </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/csDeltaNoConflate.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/csDeltaNoConflate.xml b/src/tests/cpp/xml/Delta/csDeltaNoConflate.xml
deleted file mode 100755
index 60c60a0..0000000
--- a/src/tests/cpp/xml/Delta/csDeltaNoConflate.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<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">
-  <cache-server port="$PORT_NUM"/>
-  <region name="dummy">
-    <region-attributes scope="distributed-ack" data-policy="replicate" cloning-enabled="true"/>
-    <entry>
-      <key><string>delta1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.DeltaTestImpl</class-name>
-        </declarable>
-      </value>
-    </entry>
-  </region>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" cloning-enabled="true"/>
-  </region>
-</cache>
- 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/csDeltaOverflow.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/csDeltaOverflow.xml b/src/tests/cpp/xml/Delta/csDeltaOverflow.xml
deleted file mode 100755
index aebc2b5..0000000
--- a/src/tests/cpp/xml/Delta/csDeltaOverflow.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-
-<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">
-  <cache-server port="$PORT_NUM">
-    <client-subscription eviction-policy="entry" capacity="10000" />
-  </cache-server> 
-  <region name="dummy">
-    <region-attributes scope="distributed-ack" data-policy="replicate" cloning-enabled="true"/>
-    <entry>
-      <key><string>delta1-1</string></key>
-      <value>
-        <declarable>
-           <class-name>javaobject.DeltaTestImpl</class-name>
-        </declarable>
-      </value>
-    </entry>
-  </region>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" cloning-enabled="true"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/csDeltaPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/csDeltaPR.xml b/src/tests/cpp/xml/Delta/csDeltaPR.xml
deleted file mode 100755
index c34ccd4..0000000
--- a/src/tests/cpp/xml/Delta/csDeltaPR.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<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">
-	<!--cache-server host="cod" port="24680" /-->
-	<cache-server port="$PORT_NUM"/>
-
-	<region name="dummy">
-		<region-attributes data-policy="partition" cloning-enabled="true" >
-		  <partition-attributes redundant-copies="2"/>
-		</region-attributes>
-		<entry>
-              <key><string>delta1-1</string></key>
-                <value>
-                  <declarable>
-                    <class-name>javaobject.DeltaTestImpl</class-name>
-                  </declarable>
-                </value>
-         </entry>
-	</region>
-	<region name="TestTCR1">
-		<region-attributes data-policy="partition" cloning-enabled="true" >
-		  <partition-attributes redundant-copies="2"/>
-		  </region-attributes>
-		  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/deltaPropogationFailoverForPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/deltaPropogationFailoverForPR.xml b/src/tests/cpp/xml/Delta/deltaPropogationFailoverForPR.xml
deleted file mode 100755
index 130a093..0000000
--- a/src/tests/cpp/xml/Delta/deltaPropogationFailoverForPR.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">5m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" locators="true" ping-interval="100" read-timeout="60000" subscription-redundancy="1" />
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-          <cache-listener library="deltatest" function="createDeltaValidationCacheListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
- 
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-  <client-set name="Feeder"/>
-
-  <test name="deltaPropogationFailoverForPRTest" description="test for delta for PR with failover">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Delta/csDeltaPR.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="deltatest" waitTime="5m">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="4" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="deltatest" waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="deltatest" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="do random entry ops " action="doEntryOperation" container="deltatest" waitTime="15m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>put</item>
-          <item>put</item>
-          <!--item>destroy</item-->
-          <item>put</item>
-        </oneof>
-      </data>
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="validate test" action="doValidateDeltaTest" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="deltatest" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers4" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>    
-  </test>
-
-</test-driver>
-

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/deltaPropogationFailoverNoConflation.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/deltaPropogationFailoverNoConflation.xml b/src/tests/cpp/xml/Delta/deltaPropogationFailoverNoConflation.xml
deleted file mode 100755
index 99cfb3f..0000000
--- a/src/tests/cpp/xml/Delta/deltaPropogationFailoverNoConflation.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
- <data name="ThinClientPool">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" ping-interval="100" read-timeout="60000" subscription-redundancy="3"/>
-   </snippet>
- </data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true" >
-        <cache-listener library="deltatest" function="createDeltaValidationCacheListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
- 
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-  <client-set name="Feeder"/>
-
-  <test name="deltaPropogationNoConflationTest" description="Delta test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -c 4 Delta/csDeltaNoConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers4" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="deltatest" waitTime="5m">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set  count="4"  name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-     <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="deltatest" waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="deltatest" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="do random entry ops " action="doEntryOperation" container="deltatest" waitTime="30m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>put</item>
-          <item>put</item>
-          <!--item>destroy</item-->
-          <item>put</item>
-        </oneof>
-      </data>
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set name="Client"/>
-      <data name="sleepTime">120</data>
-    </task>
-    <task name="validate test" action="doValidateDeltaTest" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="deltatest" waitTime="5m"/>
-    <task name="StopCacheServers1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers4" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
- </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/deltaPropogationForPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/deltaPropogationForPR.xml b/src/tests/cpp/xml/Delta/deltaPropogationForPR.xml
deleted file mode 100755
index 2ac318a..0000000
--- a/src/tests/cpp/xml/Delta/deltaPropogationForPR.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">5m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" locators="true" ping-interval="100" read-timeout="60000" subscription-redundancy="1" />
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-          <cache-listener library="deltatest" function="createDeltaValidationCacheListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
- 
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-  <client-set name="Feeder"/>
-
-  <test name="deltaPropogationPRTest" description="test for delta with PR">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Delta/csDeltaPR.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="deltatest" waitTime="5m">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="4" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="deltatest" waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="deltatest" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="do random entry ops " action="doEntryOperation" container="deltatest" waitTime="15m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>put</item>
-          <item>put</item>
-          <!--item>destroy</item-->
-          <item>put</item>
-        </oneof>
-      </data>
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="validate test" action="doValidateDeltaTest" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="deltatest" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/deltaPropogationNoConflation.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/deltaPropogationNoConflation.xml b/src/tests/cpp/xml/Delta/deltaPropogationNoConflation.xml
deleted file mode 100755
index e7d3fb0..0000000
--- a/src/tests/cpp/xml/Delta/deltaPropogationNoConflation.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  
- <data name="ThinClientPool">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" ping-interval="100" read-timeout="60000" subscription-redundancy="3" />
-   </snippet>
- </data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-        <cache-listener library="deltatest" function="createDeltaValidationCacheListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
- 
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-  <client-set name="Feeder"/>
-
-  <test name="deltaPropogationNoConflationTest" description="test for delta">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -c 4 Delta/csDeltaNoConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers4" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="deltatest" waitTime="5m">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set  count="4"  name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-     <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="deltatest" waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="deltatest" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="do random entry ops " action="doEntryOperation" container="deltatest" waitTime="30m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>put</item>
-          <item>put</item>
-          <!--item>destroy</item-->
-          <item>put</item>
-        </oneof>
-      </data>
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set count="4" name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="validate test" action="doValidateDeltaTest" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="deltatest" waitTime="5m"/>
-    <task name="StopCacheServers1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers4" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
- </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/deltaPropogationWithEvictionForPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/deltaPropogationWithEvictionForPR.xml b/src/tests/cpp/xml/Delta/deltaPropogationWithEvictionForPR.xml
deleted file mode 100755
index 6934833..0000000
--- a/src/tests/cpp/xml/Delta/deltaPropogationWithEvictionForPR.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">5m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>25</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-  
- <data name="ThinClientPool">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" ping-interval="100" read-timeout="60000" subscription-redundancy="1" />
-   </snippet>
- </data>
-
- <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" cloning-enabled="false"-->
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true" >
-        <cache-listener library="deltatest" function="createDeltaValidationCacheListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
- 
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-  <client-set name="Feeder"/>
-
-  <test name="deltaPropogationWithEvictionForPR" description="Delta test with Eviction for PR">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Delta/csDeltaEviction.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="deltatest" waitTime="5m">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="4" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="deltatest" waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="deltatest" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="do random entry ops " action="doEntryOperation" container="deltatest" waitTime="15m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>put</item>
-          <item>put</item>
-          <!--item>destroy</item-->
-          <item>put</item>
-        </oneof>
-      </data>
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="validate test" action="doValidateDeltaTest" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="deltatest" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/deltaPropogationWithOverFlow.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/deltaPropogationWithOverFlow.xml b/src/tests/cpp/xml/Delta/deltaPropogationWithOverFlow.xml
deleted file mode 100755
index 868877f..0000000
--- a/src/tests/cpp/xml/Delta/deltaPropogationWithOverFlow.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
- <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
- <data name="ThinClientPool">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" ping-interval="100" read-timeout="60000" subscription-redundancy="3" />
-   </snippet>
- </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" cloning-enabled="false"-->
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-        <cache-listener library="deltatest" function="createDeltaValidationCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-  <client-set name="Feeder"/>
-
-  <test name="deltaPropogationWithOverFlow" description="test for delta with Overflow">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p \"-J-DslowStartTimeForTesting=170000\" -c 4 Delta/csDeltaOverflow.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers4" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="deltatest" waitTime="5m">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set  count="4" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-     <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set  name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="deltatest" waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="deltatest" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="do random entry ops " action="doEntryOperation" container="deltatest" waitTime="30m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>put</item>
-          <!--item>destroy</item-->
-          <item>put</item>
-          <item>put</item>
-        </oneof>
-      </data>
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set name="Client"/>
-      <data name="sleepTime">120</data>
-    </task>
-    <task name="validate test" action="doValidateDeltaTest" container="deltatest" waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="failover">true</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="deltatest" waitTime="5m"/>
-    <task name="StopCacheServers1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers4" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
- </test>
-
-</test-driver>
-
-
-
-

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Delta/deltaSampleTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Delta/deltaSampleTest.xml b/src/tests/cpp/xml/Delta/deltaSampleTest.xml
deleted file mode 100644
index 4fccbde..0000000
--- a/src/tests/cpp/xml/Delta/deltaSampleTest.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" cloning-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true">
-        <cache-listener library="deltatest" function="createDeltaValidationCacheListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Client"/>
-  <client-set name="Feeder"/>
-
-  <test name="deltaSampleTest" description="Sample test for delta">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Delta/cacheserver_with_deltaobj.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="deltatest" waitTime="5m">
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="deltatest" waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="deltatest" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Update Entries in Region" action="doPuts" container="deltatest" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="validate test" action="doValidateDeltaTest" container="deltatest" waitTime="5m">
-      <client-set name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="deltatest" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/DurableClient/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/csAckMirror.xml b/src/tests/cpp/xml/DurableClient/csAckMirror.xml
deleted file mode 100644
index 019868a..0000000
--- a/src/tests/cpp/xml/DurableClient/csAckMirror.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<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">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/DurableClient/csNotifySubsNoLimit.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/csNotifySubsNoLimit.xml b/src/tests/cpp/xml/DurableClient/csNotifySubsNoLimit.xml
deleted file mode 100755
index 2b5328d..0000000
--- a/src/tests/cpp/xml/DurableClient/csNotifySubsNoLimit.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<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">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/DurableClient/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/csNotifySubscription.xml b/src/tests/cpp/xml/DurableClient/csNotifySubscription.xml
deleted file mode 100644
index 2b5328d..0000000
--- a/src/tests/cpp/xml/DurableClient/csNotifySubscription.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<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">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 


Mime
View raw message