geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [39/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:18 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableKAFalse.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableKAFalse.xml b/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableKAFalse.xml
deleted file mode 100644
index a0e83fd..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableKAFalse.xml
+++ /dev/null
@@ -1,229 +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">120</data>
-  <data name="restartTime">0</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="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 3 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="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>
-    <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>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableKATrue.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableKATrue.xml b/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableKATrue.xml
deleted file mode 100644
index a02046e..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableKATrue.xml
+++ /dev/null
@@ -1,232 +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">120</data>
-  <data name="restartTime">0</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="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 3 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="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>
-    <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>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableTimeout.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableTimeout.xml b/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableTimeout.xml
deleted file mode 100644
index 80a8643..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durablePR/durableNonDurableTimeout.xml
+++ /dev/null
@@ -1,233 +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="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="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 3 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="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>
-    <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>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durablePerfEventCount.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/DurableClient/durablePerfEventCount.xml b/src/tests/cpp/xml/Generics/DurableClient/durablePerfEventCount.xml
deleted file mode 100644
index e2a3197..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durablePerfEventCount.xml
+++ /dev/null
@@ -1,136 +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  2
-# Clients  2  durable
-Purpose  - Perf Test for Event receivng rate.
-Details  R = 1, all three clients with Reg Int All. 
- first Durable Crash,  second Durable Close with Keep Alive = true
--->
-  <data name="timedInterval">30</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</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">300</data>
-  <data name="restartTime">0</data>
-
-  <data name="ThinClientRegionWithPerfListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" function="createDurablePerfListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegionWithPerfListener</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="DClient1"/>
-  <client-set name="DClient2"/>
-  <client-set name="Feeder"/>
-	
-  <test name="DurablePerfEventRate" description="Event Recieving rate for durable Client after coming up">
-    <task name="setupCacheServers" 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="durableclienttests" waitTime="10m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Create Feeder" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Crash DC 1" action="doRunProcess" container="utils" waitTime="5m" >
-      <data name="program">stopClient</data>
-      <data name="arguments">all 3</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Cache Close KA True DC 2" action="doDurableCloseCache" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Intermediate Puts" action="doPuts" container="perftests" waitTime="5m" >
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart DC 1" action="doDummyTask" container="durableclienttests" waitTime="5m" >
-      <client-set name="DClient1"/>
-    </task>
-     <task name="ReInit Clients " action="doRestartClientAndRegInt" container="durableclienttests" waitTime="5m" parallel="true">
-      <data name="isDurableReg">true</data>
-      <data name="registerType">All</data>
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Parallel Puts" action="doPuts" container="perftests" waitTime="5m"  parallel="true">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="LogPerf" action="doLogDurablePerformance" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="Feeder"/>
-    </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/durablePerfPutGetThroughput.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/DurableClient/durablePerfPutGetThroughput.xml b/src/tests/cpp/xml/Generics/DurableClient/durablePerfPutGetThroughput.xml
deleted file mode 100644
index 0e0b3d9..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durablePerfPutGetThroughput.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">
-
-<!-- Description 
-# Servers  2
-# Clients  2  durable 
-Purpose  - Perf Test for Durable
-Details  
--->
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-      <item>5000</item>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-<!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="durableTimeout">120</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers CS1" 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 CS2" 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="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set name="Subscriber"/>
-    </task>
-    <!--task name="Register All Keys" action="doRegisterAllKeys" container="durableclienttests" waitTime="2m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="PutEntries" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task-->
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Destroys Entries" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="StopCacheServers CS1" 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 CS2" 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/durablePerfVariableTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTest.xml b/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTest.xml
deleted file mode 100644
index 498cbdb..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTest.xml
+++ /dev/null
@@ -1,128 +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  1  durable 
-Purpose  - Perf Test for durable Get / Put. 
-Details  
--->
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>50000</item>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-<!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="durableTimeout">120</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Publisher"/>
-      <data name="keyType">int</data>
-    </task>
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTest2.xml b/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTest2.xml
deleted file mode 100644
index 70a26f3..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTest2.xml
+++ /dev/null
@@ -1,211 +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  3
-# Clients  2  durable 
-Purpose  - Perf Test for durable
-Details  
--->
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>80</item>
-      <item>160</item>
-      <item>320</item>
-      <item>640</item>
-      <item>1280</item>
-      <item>2560</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-<!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="durableTimeout">120</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="CS3" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="durableclienttests" waitTime="2m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="perftests" waitTime="1h">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="perftests" waitTime="1h">
-      <client-set name="Publisher"/>
-      <data name="keyType">int</data>
-    </task>
-
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="perftests" waitTime="1h">
-      <client-set name="Publisher"/>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-
-    <task name="StartCacheServers CS3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-
-    <task name="Measure Performance Variable with cache size with 3rd cache member" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput with 3rd cache member" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size with 3rd cache member" action="doPuts" container="perftests" waitTime="1h">
-      <client-set name="Publisher"/>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="StopCacheServers CS3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTestWithHLRU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTestWithHLRU.xml b/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTestWithHLRU.xml
deleted file mode 100644
index 0c1c343..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durablePerfVariableTestWithHLRU.xml
+++ /dev/null
@@ -1,212 +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  3
-# Clients  2  durable 
-Purpose  - Perf Test with Heap LRU
-Details  
--->
-  <data name="timedInterval">100</data>
-  <data name="heapLruLimit">100</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>80</item>
-      <item>160</item>
-      <item>320</item>
-      <item>640</item>
-      <item>1280</item>
-      <item>2560</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-<!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="durableTimeout">120</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="CS3" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="durableclienttests" waitTime="2m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="perftests" waitTime="1h">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="perftests" waitTime="1h">
-      <client-set name="Publisher"/>
-      <data name="keyType">int</data>
-    </task>
-
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="perftests" waitTime="1h">
-      <client-set name="Publisher"/>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-
-    <task name="StartCacheServers CS3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-
-    <task name="Measure Performance Variable with cache size with 3rd cache member" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput with 3rd cache member" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size with 3rd cache member" action="doPuts" container="perftests" waitTime="1h">
-      <client-set name="Publisher"/>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="StopCacheServers CS3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/FESingleHopNonOptimized.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/FESingleHopNonOptimized.xml b/src/tests/cpp/xml/Generics/FunctionExecution/FESingleHopNonOptimized.xml
deleted file mode 100644
index 09aadde..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/FESingleHopNonOptimized.xml
+++ /dev/null
@@ -1,140 +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="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">1000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="objectType">PdxVersioned</data>
-  <data name="isSkipOps">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="-1" subscription-enabled="true" thread-local-connections="true" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes pool-name="_Test_Pool1" scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" pool-name="_Test_Pool1" caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </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="10" name="Client"/>
-  <data name="funcName">RegionOperationsFunctionOptimizedFalse</data>    
-
-  <test name="FESingleHopNonOptimized" description="This test creates a PR region , then does various entry operations(using function execution)
- on a known key range. Values are checked for correctness in the close task.
- This test is with client server configuration.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" 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="10m" 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="10m" 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="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="1" count="5" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-     <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="6" count="5" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="LoadRegion" action="doFeedInt" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <!--task name="DoGetServerKeys" action="doGetServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="6" count="5" name="Client"/>
-      <data name="versionNum">2</data>
-    </task-->
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="VerifYRegionContents after doOps by FE" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="1" count="5" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="VerifYRegionContents after doOps by FE" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="6" count="5" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-   <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="int,object" />
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" 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="10m" 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="10m" 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="10m" 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/Generics/FunctionExecution/FESingleHopOptimized.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/FESingleHopOptimized.xml b/src/tests/cpp/xml/Generics/FunctionExecution/FESingleHopOptimized.xml
deleted file mode 100644
index 4fde44a..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/FESingleHopOptimized.xml
+++ /dev/null
@@ -1,140 +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="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">1000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="objectType">PdxVersioned</data>
-  <data name="isSkipOps">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="-1" subscription-enabled="true" thread-local-connections="true" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes pool-name="_Test_Pool1" scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" pool-name="_Test_Pool1" caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </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="10" name="Client"/>
-  <data name="funcName">RegionOperationsFunctionOptimized</data>    
-
-  <test name="FESingleHopOptimized" description="This test creates a PR region , then does various entry operations(using function execution)
- on a known key range. Values are checked for correctness in the close task.
- This test is with client server configuration.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" 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="10m" 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="10m" 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="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="1" count="5" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-     <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="6" count="5" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="LoadRegion" action="doFeedInt" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <!-- task name="DoGetServerKeys" action="doGetServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="6" count="5" name="Client"/>
-      <data name="versionNum">2</data>
-    </task-->
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="VerifYRegionContents after doOps by FE" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="1" count="5" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="VerifYRegionContents after doOps by FE" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="6" count="5" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="int,object" />
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" 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="10m" 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="10m" 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="10m" 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/Generics/FunctionExecution/csEmptyDataPolicy.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/csEmptyDataPolicy.xml b/src/tests/cpp/xml/Generics/FunctionExecution/csEmptyDataPolicy.xml
deleted file mode 100644
index 59c393b..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/csEmptyDataPolicy.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"/>
-  <region name="TestTCR1">
-    <region-attributes  data-policy="empty">
-    </region-attributes>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.RegionOperationsFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.ServerOperationsFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.RegionOperationsWithOutResultFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.ServerOperationsWithOutResultFunction</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/csPartitionRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/csPartitionRegion.xml b/src/tests/cpp/xml/Generics/FunctionExecution/csPartitionRegion.xml
deleted file mode 100644
index adb1661..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/csPartitionRegion.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"/>
-  <region name="TestTCR1">
-    <region-attributes  data-policy="partition">
-    </region-attributes>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.RegionOperationsFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.ServerOperationsFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.RegionOperationsWithOutResultFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.ServerOperationsWithOutResultFunction</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/csPartitionRegionForFEHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/csPartitionRegionForFEHA.xml b/src/tests/cpp/xml/Generics/FunctionExecution/csPartitionRegionForFEHA.xml
deleted file mode 100644
index f1bd69b..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/csPartitionRegionForFEHA.xml
+++ /dev/null
@@ -1,17 +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  data-policy="partition">
-       <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.GetFunctionExeHA</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedPR.xml b/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedPR.xml
deleted file mode 100644
index 9039139..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedPR.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="partitionedRegion">
-    <region-attributes  data-policy="partition">
-    </region-attributes>
-  </region>
-  <region name="replicatedRegion">
-    <region-attributes  data-policy="replicate">
-    </region-attributes>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.ExceptionHandlingFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.FireNForget</class-name>
-    </function>
-  </function-service>
-</cache>


Mime
View raw message