http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableCrash.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableCrash.xml 
b/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableCrash.xml
deleted file mode 100644
index 4df9722..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableCrash.xml
+++ /dev/null
@@ -1,253 +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">
-
-<!-- Description 
-# Servers  1
-# Clients  2  durable , 1 nonDurable
-Purpose  - To test durable and non durable clients crash
-Details  R = 1. 3 types of Reg Int - All.
--->
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-       
-  <data name="keyType">str</data>
-
-  <!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="durableTimeout">300</data>
-  <data name="restartTime">30</data>
-  <data name="updateReceiveTime">30</data>
-
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" 
function="createDurableCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegionWithListener</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="DClient1"/>
-  <client-set name="DClient2"/>
-  <client-set name="NDClient1"/>
-  <client-set name="Feeder"/>
-  
-  <test name="DurableSerialCrash" description="Basic test for durable client 
Crash Client">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 DurableClient/csNotifySubsNoLimit.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" 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="StartCacheServer 2" 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="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="NDClient1"/>
-      <data name="isDurable">false</data>
-    </task>
-    <task name="Create Feeder" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Intial Puts" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m" argTypes="String,Int32">
-      <data name="valueEnd">10000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Crash All Clients: Cycle 1" action="doRunProcess" 
container="utils" waitTime="5m" argTypes="String,Int32">
-      <data name="program">stopClient</data>
-      <data name="arguments">all 3 4 5</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Intermediate Puts : Cycle 1" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m" argTypes="String,Int32">
-      <data name="valuestart">10001</data>
-      <data name="valueEnd">20000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 1" action="doDummyTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 1 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Reinit DC 2: Cycle 1 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 1" action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 1" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valuestart">20001</data>
-      <data name="valueEnd">30000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Crash All Clients: Cycle 2" action="doRunProcess" 
container="utils" waitTime="5m" >
-      <data name="program">stopClient</data>
-      <data name="arguments">all 3 4 5</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Intermediate Puts : Cycle 2" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m" argTypes="String,Int32">
-      <data name="valuestart">30001</data>
-      <data name="valueEnd">40000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 2" action="doDummyTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 2 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Reinit DC 2: Cycle 2 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 2" action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 2" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valuestart">40001</data>
-      <data name="valueEnd">50000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Crash All Clients: Cycle 3" action="doRunProcess" 
container="utils" waitTime="5m" >
-      <data name="program">stopClient</data>
-      <data name="arguments">all 3 4 5</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Intermediate Puts : Cycle 3" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m" argTypes="String,Int32">
-      <data name="valuestart">50001</data>
-      <data name="valueEnd">60000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 3" action="doDummyTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 3 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Reinit DC 2: Cycle 3 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 3" action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 3" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valuestart">60001</data>
-      <data name="valueEnd">70000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Crash All Clients: Cycle 4" action="doRunProcess" 
container="utils" waitTime="5m" >
-      <data name="program">stopClient</data>
-      <data name="arguments">all 3 4 5</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Intermediate Puts : Cycle 4" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m" argTypes="String,Int32">
-      <data name="valuestart">70001</data>
-      <data name="valueEnd">80000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 4" action="doDummyTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 4 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Reinit DC 2: Cycle 4 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 4" action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 4" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valuestart">80001</data>
-      <data name="valueEnd">90000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">120</data>
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-      <data name="restartTime">5</data>
-      <data name="missedEvents">true</data>
-    </task>
-    <task name="StopCacheServer 1" 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="StopCacheServer 2" 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/Generics/DurableClient/durableNonDurableKAFalse.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableKAFalse.xml 
b/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableKAFalse.xml
deleted file mode 100644
index 02b1663..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableKAFalse.xml
+++ /dev/null
@@ -1,218 +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">
-
-<!-- Description 
-# Servers  1
-# Clients  6  durable , 3 nonDurable
-Purpose  - To test durable and non durable clients with all Reg Ints and Close 
with KA = False
-Details  R = 1. 3 types of Reg Int. All Clients Close n Restart in cylcles. 
All Clients should miss few events.
--->
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-       
-  <data name="keyType">str</data>
-
-  <!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="keepAlive">false</data>
-  <data name="durableTimeout">20</data>
-  <data name="restartTime">30</data>
-  <data name="updateReceiveTime">60</data>
-
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" 
function="createDurableCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegionWithListener</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="DClient1"/>
-  <client-set name="DClient2"/>
-  <client-set name="DClient3"/>
-  <client-set name="DClient4"/>
-  <client-set name="DClient5"/>
-  <client-set name="DClient6"/>
-  <client-set name="NDClient1"/>
-  <client-set name="NDClient2"/>
-  <client-set name="NDClient3"/>
-  <client-set name="Feeder"/>
-  
-  <test name="DurableKAFalse" description="Basic test for durable client">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 DurableClient/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" 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="StartCacheServer 2" 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="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-      <data name="isDurable">false</data>
-    </task>
-    <task name="Create Feeder" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient4"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient5"/>
-      <client-set name="NDClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valueEnd">100000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC 1 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Close Cycle for DC 2 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Close Cycle for DC 3 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Close Cycle for DC 4 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient5"/>
-    </task>
-    <task name="Close Cycle for DC 6 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Close Cycle for NDC 1" action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Close Cycle for NDC 2" action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="NDClient2"/>
-    </task>
-    <task name="Close Cycle for NDC 3" action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">120</data>
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-      <data name="missedEvents">true</data>
-    </task>
-    <task name="StopCacheServer 1" 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="StopCacheServer 2" 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/Generics/DurableClient/durableNonDurableKATrue.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableKATrue.xml 
b/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableKATrue.xml
deleted file mode 100644
index ad37cde..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableKATrue.xml
+++ /dev/null
@@ -1,221 +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">
-
-<!-- Description 
-# Servers  1
-# Clients  6  durable , 3 nonDurable
-Purpose  - To test durable and non durable clients with all Reg Ints and Close 
with KA = True
-Details  R = 1. 3 types of Reg Int. All Clients Close n Restart in cylcles. 
-Durable Clients with Durable Reg Int should receive all events.
--->
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-       
-  <data name="keyType">str</data>
-
-  <!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="keepAlive">true</data>
-  <data name="durableTimeout">60</data>
-  <data name="restartTime">30</data>
-  <data name="updateReceiveTime">60</data>
-
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" 
function="createDurableCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegionWithListener</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="DClient1"/>
-  <client-set name="DClient2"/>
-  <client-set name="DClient3"/>
-  <client-set name="DClient4"/>
-  <client-set name="DClient5"/>
-  <client-set name="DClient6"/>
-  <client-set name="NDClient1"/>
-  <client-set name="NDClient2"/>
-  <client-set name="NDClient3"/>
-  <client-set name="Feeder"/>
-  
-  <test name="DurableKATrue" description="Basic test for durable client">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 DurableClient/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" 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="StartCacheServer 2" 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="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-      <data name="isDurable">false</data>
-    </task>
-    <task name="Create Feeder" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient4"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient5"/>
-      <client-set name="NDClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valueEnd">100000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC 1 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Close Cycle for DC 2 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Close Cycle for DC 3 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Close Cycle for DC 4 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient5"/>
-    </task>
-    <task name="Close Cycle for DC 6 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Close Cycle for NDC 1" action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Close Cycle for NDC 2" action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="NDClient2"/>
-    </task>
-    <task name="Close Cycle for NDC 3" action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">120</data>
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-      <data name="missedEvents">true</data>
-    </task>
-    <task name="StopCacheServer 1" 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="StopCacheServer 2" 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/Generics/DurableClient/durableNonDurableTimeout.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableTimeout.xml 
b/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableTimeout.xml
deleted file mode 100644
index d98c144..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durableNonDurableTimeout.xml
+++ /dev/null
@@ -1,221 +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">
-
-<!-- Description 
-# Servers  1
-# Clients  6  durable , 3 nonDurable
-Purpose  - To test durable and non durable clients with all Reg Ints and Close 
with KA = true
-Details  R = 1. 3 types of Reg Int. All Clients Close n Restart after timeout 
in cylcles. All Clients should miss few events.
--->
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-       
-  <data name="keyType">str</data>
-
-  <!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="keepAlive">true</data>
-  <data name="durableTimeout">30</data>
-  <data name="restartTime">60</data>
-
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" 
function="createDurableCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegionWithListener</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="DClient1"/>
-  <client-set name="DClient2"/>
-  <client-set name="DClient3"/>
-  <client-set name="DClient4"/>
-  <client-set name="DClient5"/>
-  <client-set name="DClient6"/>
-  <client-set name="NDClient1"/>
-  <client-set name="NDClient2"/>
-  <client-set name="NDClient3"/>
-  <client-set name="Feeder"/>
-  
-  <test name="DurableTimeOutTest" description="Basic test for durable client 
timeout">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 DurableClient/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" 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="StartCacheServer 2" 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="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-      <data name="isDurable">false</data>
-    </task>
-    <task name="Create Feeder" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient4"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient5"/>
-      <client-set name="NDClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valueEnd">100000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC 1 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <data name="restartTime">10</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Close Cycle for DC 2 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="restartTime">10</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Close Cycle for DC 3 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Close Cycle for DC 4 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient5"/>
-    </task>
-    <task name="Close Cycle for DC 6 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Close Cycle for NDC 1" action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Close Cycle for NDC 2" action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="NDClient2"/>
-    </task>
-    <task name="Close Cycle for NDC 3" action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="15m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">120</data>
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient1"/>
-      <client-set name="NDClient2"/>
-      <client-set name="NDClient3"/>
-      <data name="missedEvents">true</data>
-    </task>
-    <task name="StopCacheServer 1" 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="StopCacheServer 2" 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/Generics/DurableClient/durablePR/csNotifySubsNoLimit.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/DurableClient/durablePR/csNotifySubsNoLimit.xml 
b/src/tests/cpp/xml/Generics/DurableClient/durablePR/csNotifySubsNoLimit.xml
deleted file mode 100644
index d0767de..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durablePR/csNotifySubsNoLimit.xml
+++ /dev/null
@@ -1,12 +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>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durablePR/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/DurableClient/durablePR/csNotifySubscription.xml 
b/src/tests/cpp/xml/Generics/DurableClient/durablePR/csNotifySubscription.xml
deleted file mode 100644
index 96c2305..0000000
--- 
a/src/tests/cpp/xml/Generics/DurableClient/durablePR/csNotifySubscription.xml
+++ /dev/null
@@ -1,12 +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>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableFailoverR2.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableFailoverR2.xml 
b/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableFailoverR2.xml
deleted file mode 100644
index 065bfb4..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableFailoverR2.xml
+++ /dev/null
@@ -1,256 +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">
-
-<!-- Description 
-# Servers  5
-# Clients  6  durable 
-Purpose  - Test if HA failover is working fine for durable client. 
-Details  R = 2, Three Clients have durable Reg Int and another three is having 
non Durable Reg Int
--->
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</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="minServers">3</data>
-
-  <!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="keepAlive">true</data>
-  <data name="durableTimeout">300</data>
-  <data name="restartTime">20</data>
-  <data name="updateReceiveTime">60</data>
-
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" 
function="createDurableCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegionWithListener</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 name="JCS5" hostGroup="CS"/>
-  <client-set name="DClient1"/>
-  <client-set name="DClient2"/>
-  <client-set name="DClient3"/>
-  <client-set name="DClient4"/>
-  <client-set name="DClient5"/>
-  <client-set name="DClient6"/>
-  <client-set name="Feeder"/>
-       
-  <test name="DurableFailoverR2" description="HA Failover test for durable 
client ">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 
DurableClient/durablePR/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" 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="StartCacheServer 2" 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="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServer 5" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Create Feeder" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" parallel="true" argTypes="String,Int32">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" parallel="true" argTypes="String,Int32">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" parallel="true" argTypes="String,Int32">
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" parallel="true" argTypes="String,Int32">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient5"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valueEnd">100000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" 
container="utils" timesToRun="3" 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="3" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" 
container="utils" timesToRun="3" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" 
container="utils" timesToRun="3" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 5" action="doStopStartServer" 
container="utils" timesToRun="3" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="Close Cycle for DC 1 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="25m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Close Cycle for DC 2 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="25m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Close Cycle for DC 3 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="25m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Close Cycle for DC 4 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="25m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="25m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">List</data>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient5"/>
-    </task>
-    <task name="Close Cycle for DC 6 " action="doCloseCacheAndReInitialize" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="25m" timesToRun="5" parallel="true" argTypes="String,Int32">
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">120</data>
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient4"/>
-      <client-set name="DClient5"/>
-      <client-set name="DClient6"/>
-      <data name="missedEvents">true</data>
-    </task>
-    <task name="StopCacheServer 1" 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="StopCacheServer 2" 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="StopCacheServer 3" 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="StopCacheServer 4" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableCrash.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableCrash.xml 
b/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableCrash.xml
deleted file mode 100644
index 8d3d169..0000000
--- 
a/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableCrash.xml
+++ /dev/null
@@ -1,264 +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">
-
-<!-- Description 
-# Servers  1
-# Clients  2  durable , 1 nonDurable
-Purpose  - To test durable and non durable clients crash
-Details  R = 1. 3 types of Reg Int - All.
--->
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-       
-  <data name="keyType">str</data>
-
-  <!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="durableTimeout">300</data>
-  <data name="restartTime">30</data>
-  <data name="updateReceiveTime">30</data>
-
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" 
function="createDurableCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegionWithListener</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="DClient1"/>
-  <client-set name="DClient2"/>
-  <client-set name="NDClient1"/>
-  <client-set name="Feeder"/>
-  
-  <test name="DurableSerialCrash" description="Basic test for durable client 
Crash Client">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 
DurableClient/durablePR/csNotifySubsNoLimit.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" 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="StartCacheServer 2" 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="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Create Durable Clients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="NDClient1"/>
-      <data name="isDurable">false</data>
-    </task>
-    <task name="Create Feeder" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Intial Puts" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m" argTypes="String,Int32">
-      <data name="valueEnd">10000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Crash All Clients: Cycle 1" action="doRunProcess" 
container="utils" waitTime="5m" >
-      <data name="program">stopClient</data>
-      <data name="arguments">all 4 5 6</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Intermediate Puts : Cycle 1" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m" argTypes="String,Int32">
-      <data name="valuestart">10001</data>
-      <data name="valueEnd">20000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 1" action="doDummyTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 1 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Reinit DC 2: Cycle 1 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 1" action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 1" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valuestart">20001</data>
-      <data name="valueEnd">30000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Crash All Clients: Cycle 2" action="doRunProcess" 
container="utils" waitTime="5m" >
-      <data name="program">stopClient</data>
-      <data name="arguments">all 4 5 6</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Intermediate Puts : Cycle 2" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m" argTypes="String,Int32">
-      <data name="valuestart">30001</data>
-      <data name="valueEnd">40000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 2" action="doDummyTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 2 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Reinit DC 2: Cycle 2 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 2" action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 2" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valuestart">40001</data>
-      <data name="valueEnd">50000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Crash All Clients: Cycle 3" action="doRunProcess" 
container="utils" waitTime="5m" >
-      <data name="program">stopClient</data>
-      <data name="arguments">all 4 5 6</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Intermediate Puts : Cycle 3" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m" argTypes="String,Int32">
-      <data name="valuestart">50001</data>
-      <data name="valueEnd">60000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 3" action="doDummyTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 3 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Reinit DC 2: Cycle 3 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 3" action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 3" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valuestart">60001</data>
-      <data name="valueEnd">70000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Crash All Clients: Cycle 4" action="doRunProcess" 
container="utils" waitTime="5m" >
-      <data name="program">stopClient</data>
-      <data name="arguments">all 4 5 6</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Intermediate Puts : Cycle 4" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m" argTypes="String,Int32">
-      <data name="valuestart">70001</data>
-      <data name="valueEnd">80000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 4" action="doDummyTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 4 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Reinit DC 2: Cycle 4 " action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 4" action="doRestartClientAndRegInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="10m" parallel="true" argTypes="String,Int32">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 4" action="doIncrementalPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="30m"  parallel="true" argTypes="String,Int32">
-      <data name="valuestart">80001</data>
-      <data name="valueEnd">90000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">120</data>
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="String,Int32">
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-      <data name="restartTime">5</data>
-      <data name="missedEvents">true</data>
-    </task>
-    <task name="StopCacheServer 1" 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="StopCacheServer 2" 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="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-</test-driver>

Reply via email to