You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/01/21 18:22:40 UTC

[01/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Repository: geode
Updated Branches:
  refs/heads/next-gen-native-client-software-grant 512b34594 -> 86df4a7c2


http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/perfClientsUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/perfClientsUpdateTest.xml b/src/tests/cpp/xml/NativePR/perfClientsUpdateTest.xml
deleted file mode 100644
index 23c6f1e..0000000
--- a/src/tests/cpp/xml/NativePR/perfClientsUpdateTest.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>1000</item>
-      <item>100</item>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="30m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="15m">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="45m">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="Update Through Feeder" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>


[12/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/regionMemory.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/regionMemory.xml b/src/tests/cpp/xml/Misc/regionMemory.xml
deleted file mode 100755
index 77df9be..0000000
--- a/src/tests/cpp/xml/Misc/regionMemory.xml
+++ /dev/null
@@ -1,3174 +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="entries">10</data>
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorIl">
-    <snippet>
-      <region name="AckMirrorIl">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorIl">
-    <snippet>
-      <region name="NackMirrorIl">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorIl">
-    <snippet>
-      <region name="AckNmirrorIl">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorIl">
-    <snippet>
-      <region name="NackNmirrorIl">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  <client-set name="Driver">
-    <client name="Producer"/>
-    <client name="Consumer1"/>
-    <client name="Consumer2"/>
-    <client name="Consumer3"/>
-  </client-set>
-  <test name="Local" description="Local Region Process Growth test">
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">Local0</data>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">Local1</data>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="30">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">Local2</data>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">Local3</data>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">Local4</data>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">Local5</data>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">Local6</data>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">Local7</data>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">Local8</data>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">Local9</data>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-  </test>
-  <test name="AckMirrorNil" description="AckMirrorNil Region Process Growth test">
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorNil0</data>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorNil1</data>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorNil2</data>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorNil3</data>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorNil4</data>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorNil5</data>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorNil6</data>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorNil7</data>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorNil8</data>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorNil9</data>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-  </test>
-  <test name="NackMirrorNil" description="NackMirrorNil Region Process Growth test">
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorNil0</data>
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorNil1</data>
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorNil2</data>
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorNil3</data>
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorNil4</data>
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorNil5</data>
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorNil6</data>
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorNil7</data>
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorNil8</data>
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorNil9</data>
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-  </test>
-  <test name="AckNmirrorNil" description="AckNmirrorNil Region Process Growth test">
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorNil0</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorNil1</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorNil2</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorNil3</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorNil4</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorNil5</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorNil6</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorNil7</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorNil8</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorNil9</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-  </test>
-  <test name="NackNmirrorNil" description="NackNmirrorNil Region Process Growth test">
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackNmirrorNil0</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackNmirrorNil1</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackNmirrorNil2</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackNmirrorNil3</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackNmirrorNil4</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackNmirrorNil5</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackNmirrorNil6</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackNmirrorNil7</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackNmirrorNil8</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackNmirrorNil9</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-  </test>
-  <test name="AckMirrorIl" description="AckMirrorIl Region Process Growth test">
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorIl0</data>
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorIl1</data>
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorIl2</data>
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorIl3</data>
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorIl4</data>
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorIl5</data>
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorIl6</data>
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorIl7</data>
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorIl8</data>
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckMirrorIl9</data>
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-  </test>
-  <test name="NackMirrorIl" description="NackMirrorIl Region Process Growth test">
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorIl0</data>
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorIl1</data>
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorIl2</data>
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorIl3</data>
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorIl4</data>
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorIl5</data>
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorIl6</data>
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorIl7</data>
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorIl8</data>
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">NackMirrorIl9</data>
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-  </test>
-  <test name="AckNmirrorIl" description="AckNmirrorIl Region Process Growth test">
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorIl0</data>
-      <data name="regionSpec">AckNmirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorIl1</data>
-      <data name="regionSpec">AckNmirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorIl2</data>
-      <data name="regionSpec">AckNmirrorIl</data>
-    </task>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Remove Region" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-    <task name="Sleep" action="doSleep" container="eventtest" waitTime="20">
-      <data name="sleepTime">5</data>
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Size Check" action="doSizeCheck" container="eventtest" waitTime="30">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Add Region" action="doCreateRootRegion" container="eventtest" waitTime="60">
-      <data name="regionName">AckNmirrorIl3</data>
-      <data name="regionSpec">AckNmirrorIl</data>
-    </task>
-    <tas

<TRUNCATED>

[44/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/DurableClient/durablePR/durableNonDurableKAFalse.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePR/durableNonDurableKAFalse.xml b/src/tests/cpp/xml/DurableClient/durablePR/durableNonDurableKAFalse.xml
deleted file mode 100644
index 9e3cd49..0000000
--- a/src/tests/cpp/xml/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="durableclienttests" waitTime="10m">
-      <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="durableclienttests" waitTime="5m">
-      <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="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"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient4"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <data name="valueEnd">100000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC 1 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Close Cycle for NDC 1" action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <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/DurableClient/durablePR/durableNonDurableKATrue.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePR/durableNonDurableKATrue.xml b/src/tests/cpp/xml/DurableClient/durablePR/durableNonDurableKATrue.xml
deleted file mode 100644
index b4cd6f5..0000000
--- a/src/tests/cpp/xml/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="durableclienttests" waitTime="10m">
-      <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="durableclienttests" waitTime="5m">
-      <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="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"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient4"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <data name="valueEnd">100000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC 1 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Close Cycle for NDC 1" action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" container="durableclienttests" waitTime="5m">
-      <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/DurableClient/durablePR/durableNonDurableTimeout.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePR/durableNonDurableTimeout.xml b/src/tests/cpp/xml/DurableClient/durablePR/durableNonDurableTimeout.xml
deleted file mode 100644
index 4c1ce45..0000000
--- a/src/tests/cpp/xml/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="durableclienttests" waitTime="10m">
-      <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="durableclienttests" waitTime="5m">
-      <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="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"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient4"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <data name="valueEnd">100000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC 1 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Close Cycle for NDC 1" action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" container="durableclienttests" waitTime="5m">
-      <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/DurableClient/durablePerfEventCount.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePerfEventCount.xml b/src/tests/cpp/xml/DurableClient/durablePerfEventCount.xml
deleted file mode 100644
index e2a3197..0000000
--- a/src/tests/cpp/xml/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/DurableClient/durablePerfPutGetThroughput.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePerfPutGetThroughput.xml b/src/tests/cpp/xml/DurableClient/durablePerfPutGetThroughput.xml
deleted file mode 100644
index 0e0b3d9..0000000
--- a/src/tests/cpp/xml/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/DurableClient/durablePerfVariableTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePerfVariableTest.xml b/src/tests/cpp/xml/DurableClient/durablePerfVariableTest.xml
deleted file mode 100644
index 498cbdb..0000000
--- a/src/tests/cpp/xml/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/DurableClient/durablePerfVariableTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePerfVariableTest2.xml b/src/tests/cpp/xml/DurableClient/durablePerfVariableTest2.xml
deleted file mode 100644
index 70a26f3..0000000
--- a/src/tests/cpp/xml/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/DurableClient/durablePerfVariableTestWithHLRU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePerfVariableTestWithHLRU.xml b/src/tests/cpp/xml/DurableClient/durablePerfVariableTestWithHLRU.xml
deleted file mode 100644
index 57b57e9..0000000
--- a/src/tests/cpp/xml/DurableClient/durablePerfVariableTestWithHLRU.xml
+++ /dev/null
@@ -1,222 +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="StartCacheServers CS3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-    <task name="StopCacheServers CS3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </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/FunctionExecution/FEPRSingleHop.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/FEPRSingleHop.xml b/src/tests/cpp/xml/FunctionExecution/FEPRSingleHop.xml
deleted file mode 100644
index b63cb5c..0000000
--- a/src/tests/cpp/xml/FunctionExecution/FEPRSingleHop.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">500</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1200000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
- <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" locators="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-   <data name="minServers">3</data>                              
-  <data name="funcName">PutKeyFunction</data>    
-  <client-set count="4" name="Client"/>
-  <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="JCS6" hostGroup="CS"/>
-  
-
-  <test name="FEPRSingleHop" description="Clients use function execution to put partitioned data onto servers. Objects are DataSerializable PSTObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csFEPartitionedRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="smokeperf" waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="smokeperf" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="smokeperf" waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="smokeperf" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Put FunctionExecution" action="doPutFunctionExecutionData" container="smokeperf" parallel="true" waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 5" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="stopStartCacheServer 6" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="smokeperf" waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="smokeperf" waitTime="5m"/>
-    
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-   
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/FESingleHopNonOptimized.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/FESingleHopNonOptimized.xml b/src/tests/cpp/xml/FunctionExecution/FESingleHopNonOptimized.xml
deleted file mode 100644
index d415040..0000000
--- a/src/tests/cpp/xml/FunctionExecution/FESingleHopNonOptimized.xml
+++ /dev/null
@@ -1,139 +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="functionExecution" 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="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="pdxtests"  waitTime="3m" >
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="pdxtests" waitTime="10m" >
-      <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="pdxtests" waitTime="10m" >
-      <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="cacheserver" waitTime="20m" >
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All keys" action="doRegisterAllKeys" container="cacheserver" waitTime="2m" >
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="LoadRegion" action="doFeedInt" container="cacheserver" waitTime="20m" >
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <!-- task name="DoGetServerKeys" action="doGetServerKeys" container="functionExecution" waitTime="10m" >
-      <client-set begin="6" count="5" name="Client"/>
-      <data name="versionNum">2</data>
-    </task-->
-    <task name="DoOperations" action="doOps" container="functionExecution" waitTime="10m" >
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="cacheserver" waitTime="5m" >
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="VerifYRegionContents after doOps by FE" action="doVerifyRegionContentsAfterLateOps" container="cacheserver" waitTime="10m" >
-      <client-set begin="1" count="5" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="VerifYRegionContents after doOps by FE" action="doVerifyRegionContentsAfterLateOps" container="cacheserver" waitTime="10m" >
-      <client-set begin="6" count="5" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-   <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m" />
-    <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/FunctionExecution/FESingleHopOptimized.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/FESingleHopOptimized.xml b/src/tests/cpp/xml/FunctionExecution/FESingleHopOptimized.xml
deleted file mode 100644
index 39d7b19..0000000
--- a/src/tests/cpp/xml/FunctionExecution/FESingleHopOptimized.xml
+++ /dev/null
@@ -1,139 +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" subscription-enabled="true" min-connections="-1" 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 pool-name="_Test_Pool1" scope="distributed-ack" caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="functionExecution" 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="pdxtests"  waitTime="3m" >
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="pdxtests" waitTime="10m" >
-      <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="pdxtests" waitTime="10m" >
-      <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="cacheserver" waitTime="20m" >
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All keys" action="doRegisterAllKeys" container="cacheserver" waitTime="2m" >
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="LoadRegion" action="doFeedInt" container="cacheserver" waitTime="20m" >
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <!-- task name="DoGetServerKeys" action="doGetServerKeys" container="functionExecution" waitTime="10m" >
-      <client-set begin="5" count="5" name="Client"/>
-      <data name="versionNum">2</data>
-    </task-->
-    <task name="DoOperations" action="doOps" container="functionExecution" waitTime="10m" >
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="cacheserver" waitTime="5m" >
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="VerifYRegionContents after doOps by FE" action="doVerifyRegionContentsAfterLateOps" container="cacheserver" waitTime="10m" >
-      <client-set begin="1" count="5" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="VerifYRegionContents after doOps by FE" action="doVerifyRegionContentsAfterLateOps" container="cacheserver" waitTime="10m" >
-      <client-set begin="6" count="5" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-   <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m" />
-    <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/FunctionExecution/csEmptyDataPolicy.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csEmptyDataPolicy.xml b/src/tests/cpp/xml/FunctionExecution/csEmptyDataPolicy.xml
deleted file mode 100755
index 59c393b..0000000
--- a/src/tests/cpp/xml/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>


[39/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
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>


[33/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/csNotifySubscriptionSecurity.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/csNotifySubscriptionSecurity.xml b/src/tests/cpp/xml/Generics/NativePR/csNotifySubscriptionSecurity.xml
deleted file mode 100644
index 4a094c5..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/csNotifySubscriptionSecurity.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="Portfolios">
-    <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/NativePR/distributionCheck.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/distributionCheck.xml b/src/tests/cpp/xml/Generics/NativePR/distributionCheck.xml
deleted file mode 100644
index a6427c1..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/distributionCheck.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="timedInterval">100</data>
-  <data name="distinctKeys">
-    <list>
-      <item>184800</item>
-    </list>
-  </data>
-  <data name="expectedCount">184800</data>
-
-  <data name="valueSizes">
-    <list>
-      <item>30</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set count="50" name="Subscriber"/>
-
-  <test name="Distribution Test" description="Verify entries attempted are put and distributed">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set count="5" name="Subscriber"/>
-    </task>
-    <task name="Register Interest" action="doRegisterAllKeys" container="perftests" waitTime="5m">
-      <client-set count="5" name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify entries" action="doVerifyEntries" container="perftests" waitTime="15m">
-      <client-set count="5" name="Subscriber"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/failoverTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/failoverTest.xml b/src/tests/cpp/xml/Generics/NativePR/failoverTest.xml
deleted file mode 100644
index 8179025..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/failoverTest.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
- 
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</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>stop</item>
-      <item>stop</item>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">4</data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-	
-  <test name="YAPerfTest" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set count="5" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-    </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="stopStartCacheServer 6" action="doStopStartServer" container="utils" timesToRun="3" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/perfBenchmarkTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/perfBenchmarkTCR.xml b/src/tests/cpp/xml/Generics/NativePR/perfBenchmarkTCR.xml
deleted file mode 100644
index be23d94..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/perfBenchmarkTCR.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="clientCount">2</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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-identical" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Puts-identical" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys-identical" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]"> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-overlap1" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-overlap2" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-overlap1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-overlap2" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-overlap1" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-overlap2" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-non-overlap1" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-non-overlap2" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-non-overlap1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-non-overlap2" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-non-overlap1" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-non-overlap2" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/perfClientsUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/perfClientsUpdateTest.xml b/src/tests/cpp/xml/Generics/NativePR/perfClientsUpdateTest.xml
deleted file mode 100644
index c571770..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/perfClientsUpdateTest.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>1000</item>
-      <item>100</item>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="Update Through Feeder" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/perfCyberTraderLatencyPut.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/perfCyberTraderLatencyPut.xml b/src/tests/cpp/xml/Generics/NativePR/perfCyberTraderLatencyPut.xml
deleted file mode 100644
index 89552bc..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/perfCyberTraderLatencyPut.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-      <!--item>1000</item>
-      <item>10000</item>
-      <item>100000</item>
-      <item>184877</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>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListenerP"/>
-        </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 name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <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">-c 6 NativePR/csNotifySubscription.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="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="regionSpec">ThinClientRegionListener</data>
-    </task>
-    <task name="Measure Put doLatencyPuts" action="doLatencyPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="regionSpec">ThinClientRegionListener</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="PutEntries" action="doLatencyPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/perfCyberTraderPutGetThroughput.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/perfCyberTraderPutGetThroughput.xml b/src/tests/cpp/xml/Generics/NativePR/perfCyberTraderPutGetThroughput.xml
deleted file mode 100644
index d19b3ac..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/perfCyberTraderPutGetThroughput.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>
-
-  <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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-	
-  <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">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Destroys Entries" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="PutEntries" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroyTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroyTCR.xml b/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroyTCR.xml
deleted file mode 100644
index 810fdea..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroyTCR.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <!--item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-             <!--item>5000</item>
-             <item>10000</item-->
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroyTCRscaledUp.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroyTCRscaledUp.xml b/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroyTCRscaledUp.xml
deleted file mode 100644
index 236f9fc..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroyTCRscaledUp.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-      <item>1000</item>
-      <item>10000</item>
-      <!--item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-             <!--item>5000</item>
-             <item>10000</item-->
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-  <client-set name="Putter3"/>
-  <client-set name="Getter3"/>
-  <client-set name="Destroyer3"/>
-  <client-set name="Putter4"/>
-  <client-set name="Getter4"/>
-  <client-set name="Destroyer4"/>
-	
-  <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">-c 3 NativePR/csNotifySubscription.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="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-	   <!-- create region and measure throughput for putter,getter,destroyer - 3 -->
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter3"/>
-      <client-set name="Getter3"/>
-      <client-set name="Destroyer3"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Putter3"/>
-      <client-set name="Getter3"/>
-      <client-set name="Destroyer3"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter3"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter3"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Destroyer3"/>
-    </task>
-	   <!-- create region and measure throughput for putter,getter,destroyer - 4 -->
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter4"/>
-      <client-set name="Getter4"/>
-      <client-set name="Destroyer4"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Putter4"/>
-      <client-set name="Getter4"/>
-      <client-set name="Destroyer4"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter4"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]"> 
-      <client-set name="Getter4"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Destroyer4"/>
-    </task>
-	   <!-- stopping all the 4 servers -->
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroy_FullInterestTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroy_FullInterestTCR.xml b/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroy_FullInterestTCR.xml
deleted file mode 100644
index 54d084a..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroy_FullInterestTCR.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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">-c 6 NativePR/csConflationNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroy_PartialInterestTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroy_PartialInterestTCR.xml b/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroy_PartialInterestTCR.xml
deleted file mode 100644
index be4ef52..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/perfTestPutGetDestroy_PartialInterestTCR.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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">-c 6 NativePR/csConflationNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>


[02/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/CyberTraderPerfVariableTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/CyberTraderPerfVariableTest.xml b/src/tests/cpp/xml/NativePR/CyberTraderPerfVariableTest.xml
deleted file mode 100644
index 241a7f4..0000000
--- a/src/tests/cpp/xml/NativePR/CyberTraderPerfVariableTest.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</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="JCS6" 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">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="perftests" 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="90m">
-      <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="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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/CyberTraderPerfVariableTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/CyberTraderPerfVariableTest2.xml b/src/tests/cpp/xml/NativePR/CyberTraderPerfVariableTest2.xml
deleted file mode 100644
index e7f36e3..0000000
--- a/src/tests/cpp/xml/NativePR/CyberTraderPerfVariableTest2.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>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>
-
-  <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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <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">-c 4 NativePR/csNotifySubscription.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="CreateRegionForPerformanceVariable" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Subscriber"/>
-    </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="45m">
-      <client-set name="Publisher"/>
-      <data name="keyType">int</data>
-    </task>
-
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="perftests" waitTime="30m">
-      <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="15m">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="perftests" waitTime="45m">
-      <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="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="Measure Performance Variable with cache size with 3rd cache member" action="doPuts" container="perftests" waitTime="30m">
-      <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="15m">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size with 3rd cache member" action="doPuts" container="perftests" waitTime="90m">
-      <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="15m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <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/NativePR/clientEvents.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/clientEvents.xml b/src/tests/cpp/xml/NativePR/clientEvents.xml
deleted file mode 100644
index 4819cab..0000000
--- a/src/tests/cpp/xml/NativePR/clientEvents.xml
+++ /dev/null
@@ -1,130 +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="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativePR/csNotifySubscription.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="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="30m">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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/NativePR/clientEventsFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/clientEventsFailover.xml b/src/tests/cpp/xml/NativePR/clientEventsFailover.xml
deleted file mode 100644
index ba8b9db..0000000
--- a/src/tests/cpp/xml/NativePR/clientEventsFailover.xml
+++ /dev/null
@@ -1,167 +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="redundancyLevel">1</data>
-  
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>stop</item>
-      <item>stop</item>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="30" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativePR/csNotifySubscription.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="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="30" name="Client"/>
-    </task>    
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="30m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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/NativePR/clientPayloadScalability.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/clientPayloadScalability.xml b/src/tests/cpp/xml/NativePR/clientPayloadScalability.xml
deleted file mode 100644
index 560d0f9..0000000
--- a/src/tests/cpp/xml/NativePR/clientPayloadScalability.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="false">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-
-  <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">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>5120</item>
-          <item>10240</item>
-          <item>512000</item>
-          <item>102400</item>
-          <item>5242880</item>
-          <item>10485760</item>
-          <item>31457280</item>
-          <item>52428800</item>
-          <item>73400320</item>
-          <item>104857600</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>209715200</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>314572800</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>419430400</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>524288000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/clientScalabilityMultiServerTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/clientScalabilityMultiServerTest.xml b/src/tests/cpp/xml/NativePR/clientScalabilityMultiServerTest.xml
deleted file mode 100644
index 0bcfe18..0000000
--- a/src/tests/cpp/xml/NativePR/clientScalabilityMultiServerTest.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="distinctKeysForDestroyTask">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="1024" name="ThinClient"/>
-
-  <test name="ClientScalabilityTestWith2server" description="ThinClientRegion client scalability tests with 2 server">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="3" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="5" count="12" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="17" count="16" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="33" count="32" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="65" count="64" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="129" count="128" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="257" count="256" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="513" count="512" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/clientScalabilityTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/clientScalabilityTest.xml b/src/tests/cpp/xml/NativePR/clientScalabilityTest.xml
deleted file mode 100644
index 48eb836..0000000
--- a/src/tests/cpp/xml/NativePR/clientScalabilityTest.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="distinctKeysForDestroyTask">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="1024" name="ThinClient"/>
-
-
-  <test name="ClientScalabilityTest" description="ThinClientRegion client scalability tests">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="3" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="5" count="12" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="17" count="16" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="33" count="32" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="65" count="64" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="129" count="128" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="257" count="256" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="513" count="512" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/conflationTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/conflationTest.xml b/src/tests/cpp/xml/NativePR/conflationTest.xml
deleted file mode 100644
index 29ef234..0000000
--- a/src/tests/cpp/xml/NativePR/conflationTest.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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">-c 6 NativePR/csConflationNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/csConflationNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/csConflationNotifySubscription.xml b/src/tests/cpp/xml/NativePR/csConflationNotifySubscription.xml
deleted file mode 100644
index a2bfee0..0000000
--- a/src/tests/cpp/xml/NativePR/csConflationNotifySubscription.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 enable-subscription-conflation="true">
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/csNotifySubscription.xml b/src/tests/cpp/xml/NativePR/csNotifySubscription.xml
deleted file mode 100644
index 963cea2..0000000
--- a/src/tests/cpp/xml/NativePR/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="1"/>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/csNotifySubscriptionSecurity.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/csNotifySubscriptionSecurity.xml b/src/tests/cpp/xml/NativePR/csNotifySubscriptionSecurity.xml
deleted file mode 100644
index 4a094c5..0000000
--- a/src/tests/cpp/xml/NativePR/csNotifySubscriptionSecurity.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="Portfolios">
-    <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/NativePR/distributionCheck.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/distributionCheck.xml b/src/tests/cpp/xml/NativePR/distributionCheck.xml
deleted file mode 100644
index a6427c1..0000000
--- a/src/tests/cpp/xml/NativePR/distributionCheck.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="timedInterval">100</data>
-  <data name="distinctKeys">
-    <list>
-      <item>184800</item>
-    </list>
-  </data>
-  <data name="expectedCount">184800</data>
-
-  <data name="valueSizes">
-    <list>
-      <item>30</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set count="50" name="Subscriber"/>
-
-  <test name="Distribution Test" description="Verify entries attempted are put and distributed">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set count="5" name="Subscriber"/>
-    </task>
-    <task name="Register Interest" action="doRegisterAllKeys" container="perftests" waitTime="5m">
-      <client-set count="5" name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify entries" action="doVerifyEntries" container="perftests" waitTime="15m">
-      <client-set count="5" name="Subscriber"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/failoverTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/failoverTest.xml b/src/tests/cpp/xml/NativePR/failoverTest.xml
deleted file mode 100644
index bc35fd8..0000000
--- a/src/tests/cpp/xml/NativePR/failoverTest.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
- 
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</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>stop</item>
-      <item>stop</item>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">4</data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-	
-  <test name="YAPerfTest" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="5" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClient"/>
-    </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="stopStartCacheServer 6" action="doStopStartServer" container="utils" timesToRun="3" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/perfBenchmarkTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/perfBenchmarkTCR.xml b/src/tests/cpp/xml/NativePR/perfBenchmarkTCR.xml
deleted file mode 100644
index 8ebd8e4..0000000
--- a/src/tests/cpp/xml/NativePR/perfBenchmarkTCR.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="clientCount">2</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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-identical" action="doGets" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Puts-identical" action="doPuts" container="perftests" waitTime="15m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys-identical" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-overlap1" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-overlap2" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-overlap1" action="doPuts" container="perftests" waitTime="15m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-overlap2" action="doPuts" container="perftests" waitTime="15m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-overlap1" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-overlap2" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-non-overlap1" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-non-overlap2" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-non-overlap1" action="doPuts" container="perftests" waitTime="15m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-non-overlap2" action="doPuts" container="perftests" waitTime="15m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-non-overlap1" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-non-overlap2" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>


[30/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/concRRFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/concRRFailover.xml b/src/tests/cpp/xml/Generics/ResumableTx/concRRFailover.xml
deleted file mode 100755
index 9e0f017..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/concRRFailover.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">5m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  <data name="TxBool">
-    <oneof>
-      <item>true</item>
-      <item>false</item>
-    </oneof>
-  </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">2</data>
-  
-  <data name="keyType">str</data>
-  <data name="clientCount">3</data>
-  <data name="isConcurrentExecution">true</data>
-  <data name="minExecutions">10</data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" servers="true"/>
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-         <cache-listener library="resumabletx" 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 name="JCS5" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-  
-  <test name="ConcurrentRRFailOverTest" description="This test runs with multiple bridgeServers and edge clients.  The servers host a PartitionedRegion. 
-Edge clients execute concurrent resumeable transactions using function execution. Active transactions are maintained in a map on the BB.
-After a configurable mininum number of suspend+doOps+resume executions have completed the transactions are committed.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Do Conc Tx With Random Ops" action="doConcTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String" parallel="true">
-       <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="opsSecond">5</data>
-      <data name="regionName">TestTCR1</data>
-      <data name="workTime">100</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="3" name="Client"/>
-    </task> 
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set count="3" name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>	
-    <task name="finish All Active Tx" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" 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/ResumableTx/concRRWithOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/concRRWithOps.xml b/src/tests/cpp/xml/Generics/ResumableTx/concRRWithOps.xml
deleted file mode 100755
index 4df5ff0..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/concRRWithOps.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">5m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  <data name="TxBool">
-    <oneof>
-      <item>true</item>
-      <item>false</item>
-    </oneof>
-  </data>
-  
-  <data name="keyType">str</data>
-  <data name="clientCount">3</data>
-  <data name="isConcurrentExecution">true</data>
-  <data name="minExecutions">10</data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" servers="true"/>
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-         <cache-listener library="resumabletx" 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 name="JCS5" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-  
-  <test name="ConcurrentRRTest" description="This test runs with multiple bridgeServers and edge clients.  The servers host a PartitionedRegion. 
-Edge clients execute concurrent resumeable transactions using function execution. Active transactions are maintained in a map on the BB.
-After a configurable mininum number of suspend+doOps+resume executions have completed the transactions are committed.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Do Conc Tx With Random Ops" action="doConcTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-       <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <!--item>invalidate</item-->
-          <!--item>destroy</item-->
-          <item>update</item>
-          <item>get</item>
-          <!--item>putAll</item-->          
-        </oneof>
-      </data>
-      <data name="opsSecond">5</data>
-      <data name="regionName">TestTCR1</data>
-      <data name="workTime">100</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="3" name="Client"/>
-    </task> 
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set count="3" name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>	
-    <task name="finish All Active Tx" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" 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/ResumableTx/csPRTx.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/csPRTx.xml b/src/tests/cpp/xml/Generics/ResumableTx/csPRTx.xml
deleted file mode 100755
index d7eef82..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/csPRTx.xml
+++ /dev/null
@@ -1,16 +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" total-num-buckets="20">
-        <partition-resolver>
-          <class-name>javaobject.ModPartitionResolver</class-name>
-        </partition-resolver>
-      </partition-attributes>
-    </region-attributes>
-  </region>
- </cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/csTx.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/csTx.xml b/src/tests/cpp/xml/Generics/ResumableTx/csTx.xml
deleted file mode 100755
index 4b30cad..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/csTx.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
- </cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/resumableTx.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/resumableTx.list b/src/tests/cpp/xml/Generics/ResumableTx/resumableTx.list
deleted file mode 100644
index d13ad81..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/resumableTx.list
+++ /dev/null
@@ -1,6 +0,0 @@
-Generics/ResumableTx/concPRWithOps.xml
-Generics/ResumableTx/concRRWithOps.xml
-Generics/ResumableTx/serialPRWithOps.xml
-Generics/ResumableTx/serialRRWithOps.xml
-Generics/ResumableTx/concRRFailover.xml
-Generics/ResumableTx/serialRRFailover.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/serialPRFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/serialPRFailover.xml b/src/tests/cpp/xml/Generics/ResumableTx/serialPRFailover.xml
deleted file mode 100755
index ce124ec..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/serialPRFailover.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-  
-  <data name="minServers">3</data>
- 
-    <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>10</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" servers="true" />
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true"/>
-      </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 name="JCS5" hostGroup="CS"/>
-  <client-set count="1" name="Client"/>
-  
-  <test name="SerialPRFailoverTest" description="Serial test threads begin the transaction do tryResume+RandomOps+Suspend commit in a serial fashion along with failover and then validation is done">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csPRTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="Begin TX" action="doBeginTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isBeginTX">true</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="do Serial Tx with Random Ops" action="doSerialTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>invalidate</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="isSerialExecution">true</data>
-      <client-set name="Client"/>
-    </task> 
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="5m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="5m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set name="Client"/>
-      <data name="sleepTime">10</data>
-    </task>
-    <task name="Commit TX" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCommitTX">true</data>
-      <client-set name="Client"/>
-    </task>	
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" 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/ResumableTx/serialPRWithOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/serialPRWithOps.xml b/src/tests/cpp/xml/Generics/ResumableTx/serialPRWithOps.xml
deleted file mode 100755
index 117f584..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/serialPRWithOps.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-  
- 
-  <data name="commitPercentage">80</data>
-
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" servers="true" />
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Client"/>
-  
-  <test name="SerialPRWithRandomOps" description="Serial test threads begin the transaction do tryResume+RandomOps+Suspend commit in a serial fashion and then validation is done">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csPRTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="Begin TX" action="doBeginTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isBeginTX">true</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="do Serial Tx with Random Ops" action="doSerialTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>update</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="isSerialExecution">true</data>
-      <client-set name="Client"/>
-    </task> 
-    <task name="Commit TX" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCommitTX">true</data>
-      <client-set name="Client"/>
-    </task>	
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/ResumableTx/serialRRFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/serialRRFailover.xml b/src/tests/cpp/xml/Generics/ResumableTx/serialRRFailover.xml
deleted file mode 100755
index 924d43c..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/serialRRFailover.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-  
-  <data name="minServers">2</data>
- 
-    <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" servers="true" />
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true"/>
-      </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 name="JCS5" hostGroup="CS"/>
-  <client-set count="1" name="Client"/>
-  
-  <test name="SerialRRFailoverTest" description="Serial test threads begin the transaction do tryResume+RandomOps+Suspend commit in a serial fashion along with failover and then validation is done">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="Begin TX" action="doBeginTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isBeginTX">true</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="do Serial Tx with Random Ops" action="doSerialTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="isSerialExecution">true</data>
-      <client-set name="Client"/>
-    </task> 
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Commit TX" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCommitTX">true</data>
-      <client-set name="Client"/>
-    </task>	
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" 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/ResumableTx/serialRRWithOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/serialRRWithOps.xml b/src/tests/cpp/xml/Generics/ResumableTx/serialRRWithOps.xml
deleted file mode 100755
index e78045b..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/serialRRWithOps.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-  
- 
-  <data name="commitPercentage">80</data>
-
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" servers="true" />
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Client"/>
-  
-  <test name="SerialRRWithRandomOps" description="Serial test threads begin the transaction do tryResume+RandomOps+Suspend commit in a serial fashion and then validation is done">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="Begin TX" action="doBeginTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isBeginTX">true</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="do Serial Tx with Random Ops" action="doSerialTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>invalidate</item>
-        </oneof>
-      </data>
-      <data name="isSerialExecution">true</data>
-      <client-set name="Client"/>
-    </task> 
-    <task name="Commit TX" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCommitTX">true</data>
-      <client-set name="Client"/>
-    </task>	
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/Security/Native/clientAuthnAndAuthzFailoverTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzFailoverTest.xml b/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzFailoverTest.xml
deleted file mode 100644
index 16593da..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzFailoverTest.xml
+++ /dev/null
@@ -1,274 +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="securityScheme">
-   <list>
-     <item>LDAP</item>
-     <item>DUMMY</item>
-     <item>PKCS</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-  
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="Feeder"/>
-  <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="WriterClient"/>
-  <client-set count="10" name="ReaderClient"/>
-  <client-set count="10" name="QueryClient"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,byte[]">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Native/csAckMirrorSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-        </list>
-      </data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClientsWithWriterAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-          <item>destroy</item>
-        </list>
-      </data>
-      <client-set count="10" name="WriterClient"/>
-    </task>
-    <task name="CreateClientsWithReaderAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>get</item>
-          <item>register_interest</item>
-          <item>unregister_interest</item>
-        </list>
-      </data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>
-    <task name="CreateClientsWithQueryAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>query</item>
-        </list>
-      </data>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="40m" argTypes="String,byte[]">
-      <data name="entryCount">10000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>getServerKeys</item> 
-          <item>regNUnregInterest</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">10</data>
-      <client-set count="10" name="WriterClient"/>
-      <client-set count="10" name="ReaderClient"/>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">4</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name=" Validate on Writer Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Writer Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>get</item>
-         <item>getServerKeys</item>
-         <item>regNUnregInterest</item>
-         <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>query</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Query Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>query</item>
-         <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name=" Validate on Query Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>get</item>
-         <item>getServerKeys</item>
-         <item>regNUnregInterest</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <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/Security/Native/clientAuthnAndAuthzTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTest.xml b/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTest.xml
deleted file mode 100644
index ea7449d..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTest.xml
+++ /dev/null
@@ -1,227 +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="securityScheme">
-   <list>
-     <item>DUMMY</item>
-     <item>PKCS</item>
-     <item>LDAP</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="WriterClient"/>
-  <client-set count="10" name="ReaderClient"/>
-  <client-set count="10" name="QueryClient"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,byte[]">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native/csAckMirrorSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-        </list>
-      </data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClientsWithWriterAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-          <item>destroy</item>
-        </list>
-      </data>
-      <client-set count="10" name="WriterClient"/>
-    </task>
-    <task name="CreateClientsWithReaderAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>get</item>
-          <item>register_interest</item>
-          <item>unregister_interest</item>
-        </list>
-      </data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>
-    <task name="CreateClientsWithQueryAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>query</item>
-        </list>
-      </data>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="40m" argTypes="String,byte[]">
-      <data name="entryCount">10000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>getServerKeys</item>
-          <item>regNUnregInterest</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">10</data>
-      <client-set count="10" name="WriterClient"/>
-      <client-set count="10" name="ReaderClient"/>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name=" Validate on Writer Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Writer Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>get</item>
-         <item>getServerKeys</item>
-         <item>regNUnregInterest</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>query</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Query Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>query</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name=" Validate on Query Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>get</item>
-         <item>getServerKeys</item>
-         <item>regNUnregInterest</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <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/Security/Native/clientAuthnAndAuthzTestFailoverMU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestFailoverMU.xml b/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestFailoverMU.xml
deleted file mode 100644
index 070b5c3..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestFailoverMU.xml
+++ /dev/null
@@ -1,176 +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="securityScheme">
-   <list>
-      <item>DUMMY</item>
-      <item>LDAP</item>
-      <item>PKCS</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-  <data name="isFailover">true</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="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="2" name="Client"/>
-  
-  <test name="MultiUser Security tests" description="To verify multiple users Authentication and Authorization in Failover case" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,String">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -c 3 Security/Native/csAckMirrorSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateClient" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="10m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name ="multiUserMode">true</data>
-      <data name="MultiUsers">9</data>
-      <data name="LDAP">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="PKCS">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="DUMMY">
-        <oneof>
-         <item>user</item>  
-        </oneof>    
-      </data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeedTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="40m" argTypes="String,String">
-      <data name="entryCount">10000</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForMU" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>getServerKeys</item>
-          <item>putAll</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>executefunction</item>
-          <item>executefunction</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true"  argTypes="String,String">
-      <data name="ServerId">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,String">
-      <data name="ServerId">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,String">
-      <data name="ServerId">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name=" Validate for per user" action="doValidateEntryOperationsForPerUser" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="5m" argTypes="String,String">
-       <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <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/Security/Native/clientAuthnAndAuthzTestMU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestMU.xml b/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestMU.xml
deleted file mode 100644
index f0e58ac..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestMU.xml
+++ /dev/null
@@ -1,100 +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="securityScheme">
-   <list>
-      <item>DUMMY</item>
-      <item>LDAP</item>
-      <item>PKCS</item>
-   </list>
-  </data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="5" name="Client"/>
-  
-  <test name="MultiUser Security tests" description="To verify multiple users Authentication and Authorization" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,String">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Security/Native/csAckMirrorSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateClient" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="10m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name ="multiUserMode">true</data>
-      <data name="MultiUsers">9</data>
-      <data name="LDAP">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="PKCS">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="DUMMY">
-        <oneof>
-         <item>user</item>  
-        </oneof>    
-      </data>
-      <client-set count="5" name="Client"/>
-   
-    </task>
-    <task name="FeedSystem" action="doFeedTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="40m" argTypes="String,String">
-      <data name="entryCount">10000</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForMU" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="30m" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>getServerKeys</item>
-          <item>destroy</item>
-          <item>destroy</item>
-          <item>putAll</item>
-          <item>putAll</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>executefunction</item>
-          <item>executefunction</item>
-        </oneof>
-      </data>
-      <data name="workTime">7m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <client-set count="5" name="Client"/>
-    </task>
-    <task name=" Validate for per user" action="doValidateEntryOperationsForPerUser" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="5m" argTypes="String,String">
-       <client-set count="5" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csAckMirror.xml b/src/tests/cpp/xml/Generics/Security/Native/csAckMirror.xml
deleted file mode 100644
index 99da0ac..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csAckMirror.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csAckMirrorSecurity.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csAckMirrorSecurity.xml b/src/tests/cpp/xml/Generics/Security/Native/csAckMirrorSecurity.xml
deleted file mode 100644
index ea9b92c..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csAckMirrorSecurity.xml
+++ /dev/null
@@ -1,18 +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="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>                                 
-  <function-service>
-    <function>
-      <class-name>javaobject.RegionOperationsFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.ServerOperationsFunction</class-name>
-    </function>
-  </function-service>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csConflationNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csConflationNotifySubscription.xml b/src/tests/cpp/xml/Generics/Security/Native/csConflationNotifySubscription.xml
deleted file mode 100644
index 2ad8297..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csConflationNotifySubscription.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" enable-subscription-conflation="true">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csHlru.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csHlru.xml b/src/tests/cpp/xml/Generics/Security/Native/csHlru.xml
deleted file mode 100644
index 5800a58..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csHlru.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="500" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csMirror.xml b/src/tests/cpp/xml/Generics/Security/Native/csMirror.xml
deleted file mode 100644
index fd1d1cb..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csMirror.xml
+++ /dev/null
@@ -1,11 +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" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csNotifySubscription.xml b/src/tests/cpp/xml/Generics/Security/Native/csNotifySubscription.xml
deleted file mode 100644
index 08dd68a..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csNotifySubscription.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csServerEviction.xml b/src/tests/cpp/xml/Generics/Security/Native/csServerEviction.xml
deleted file mode 100644
index dee4fb2..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csServerEviction.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack">
-      <eviction-attributes>
-        <lru-heap-percentage maximum="70" time-interval="100"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 


[03/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml b/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
deleted file mode 100644
index 4cef010..0000000
--- a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml b/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
deleted file mode 100644
index 36d3b0d..0000000
--- a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml b/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml
deleted file mode 100644
index 7c88962..0000000
--- a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">3</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <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/NativeHA/throughPuts10M.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/throughPuts10M.xml b/src/tests/cpp/xml/NativeHA/throughPuts10M.xml
deleted file mode 100644
index 8c601a5..0000000
--- a/src/tests/cpp/xml/NativeHA/throughPuts10M.xml
+++ /dev/null
@@ -1,214 +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="burstMillis">300</data>
-  <data name="burstPause">6</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">1</data>
-  <data name="interestPercent">10</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys"><list><item>50</item></list></data>
-  <data name="valueSizes"><list><item>10485760</item></list></data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-                   client-notification="true" lru-entries-limit="5"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder"/>
-
-
-  <test name="32 clients per server 10M values" description="Feed throughput testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 10M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="72" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 10M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 10M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/throughPuts1K.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/throughPuts1K.xml b/src/tests/cpp/xml/NativeHA/throughPuts1K.xml
deleted file mode 100644
index 2580857..0000000
--- a/src/tests/cpp/xml/NativeHA/throughPuts1K.xml
+++ /dev/null
@@ -1,249 +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="burstMillis">300</data>
-  <data name="burstPause">6</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">100</data>
-  <data name="interestPercent">10</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys"><list><item>52428</item></list></data>
-  <data name="valueSizes"><list><item>1024</item></list></data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" 
-            client-notification="true" lru-entries-limit="10000"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder"/>
-
-
-  <test name="32 clients per server 1k values" description="Feed throughput testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">0</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">1</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set begin="33" count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">2</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set begin="65" count="32" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 1k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 1k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 1k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/throughPuts32K.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/throughPuts32K.xml b/src/tests/cpp/xml/NativeHA/throughPuts32K.xml
deleted file mode 100644
index 1188d81..0000000
--- a/src/tests/cpp/xml/NativeHA/throughPuts32K.xml
+++ /dev/null
@@ -1,249 +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="burstMillis">300</data>
-  <data name="burstPause">6</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">50</data>
-  <data name="interestPercent">10</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys"><list><item>16384</item></list></data>
-  <data name="valueSizes"><list><item>32768</item></list></data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-                     client-notification="true" lru-entries-limit="1000"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder"/>
-
-
-  <test name="32 clients per server 32k values" description="Feed throughput testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">0</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">1</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set begin="33" count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">2</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set begin="65" count="32" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/throughPuts5M.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/throughPuts5M.xml b/src/tests/cpp/xml/NativeHA/throughPuts5M.xml
deleted file mode 100644
index bc8cee1..0000000
--- a/src/tests/cpp/xml/NativeHA/throughPuts5M.xml
+++ /dev/null
@@ -1,214 +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="burstMillis">300</data>
-  <data name="burstPause">6</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">1</data>
-  <data name="interestPercent">10</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys"><list><item>100</item></list></data>
-  <data name="valueSizes"><list><item>5242880</item></list></data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-                    client-notification="true" lru-entries-limit="10"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder"/>
-
-
-  <test name="32 clients per server 5M values" description="Feed throughput testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 5M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="72" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 5M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 5M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/throughPuts8K.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/throughPuts8K.xml b/src/tests/cpp/xml/NativeHA/throughPuts8K.xml
deleted file mode 100644
index 52de6aa..0000000
--- a/src/tests/cpp/xml/NativeHA/throughPuts8K.xml
+++ /dev/null
@@ -1,214 +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="burstMillis">300</data>
-  <data name="burstPause">6</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">100</data>
-  <data name="interestPercent">10</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys"><list><item>65536</item></list></data>
-  <data name="valueSizes"><list><item>8192</item></list></data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-                    client-notification="true" lru-entries-limit="5000"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder"/>
-
-
-  <test name="32 clients per server 8k values" description="Feed throughput testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 8k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="72" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 8k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 8k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <!-- Throughput measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeMorgan/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeMorgan/csAckMirror.xml b/src/tests/cpp/xml/NativeMorgan/csAckMirror.xml
deleted file mode 100644
index 6d8a823..0000000
--- a/src/tests/cpp/xml/NativeMorgan/csAckMirror.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeMorgan/csNackMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeMorgan/csNackMirror.xml b/src/tests/cpp/xml/NativeMorgan/csNackMirror.xml
deleted file mode 100644
index 5232682..0000000
--- a/src/tests/cpp/xml/NativeMorgan/csNackMirror.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-no-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeMorgan43/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeMorgan43/csAckMirror.xml b/src/tests/cpp/xml/NativeMorgan43/csAckMirror.xml
deleted file mode 100644
index fdca041..0000000
--- a/src/tests/cpp/xml/NativeMorgan43/csAckMirror.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeMorgan43/csNackMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeMorgan43/csNackMirror.xml b/src/tests/cpp/xml/NativeMorgan43/csNackMirror.xml
deleted file mode 100644
index bf4280f..0000000
--- a/src/tests/cpp/xml/NativeMorgan43/csNackMirror.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-no-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativePR/CyberTraderInterestListUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativePR/CyberTraderInterestListUpdateTest.xml b/src/tests/cpp/xml/NativePR/CyberTraderInterestListUpdateTest.xml
deleted file mode 100644
index 4aeacfd..0000000
--- a/src/tests/cpp/xml/NativePR/CyberTraderInterestListUpdateTest.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1848</item>
-    </list>
-  </data>
-  <data name="expectedCount">1848</data>
-
-  <data name="valueSizes">
-    <list>
-      <item>3000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <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">-c 6 NativePR/csConflationNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Gets Entries in Subscriber" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>


[34/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/mixedRedundancyTestHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/mixedRedundancyTestHA.xml b/src/tests/cpp/xml/Generics/NativeHA/mixedRedundancyTestHA.xml
deleted file mode 100644
index a38b189..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/mixedRedundancyTestHA.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">7m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="ThinClientHA1"/>
-  <client-set count="10" name="ThinClientHA2"/>
-  <client-set count="10" name="ThinClientHA3"/>
-
-  <test name="TcrHAMixedRedundancy" description="Thin Client HA mixed redundancy test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClientHA1"/>
-      <data name="redundancyLevel">0</data>
-    </task>
-    <task name="CreateRegion2" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClientHA2"/>
-      <data name="redundancyLevel">1</data>
-    </task>
-    <task name="CreateRegion3" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClientHA3"/>
-      <data name="redundancyLevel">2</data>
-    </task>
-    <task name="Populating Entries" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set begin="6" count="1" name="ThinClientHA1"/>
-    </task>
-    <task name="Register Partial Interest List 1" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA1"/>
-    </task>
-    <task name="Register Partial Interest List 2" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA2"/>
-    </task>
-    <task name="Register Partial Interest List 3" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA3"/>
-    </task>
-
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-
-    <task name="Gets1" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set count="5" name="ThinClientHA1"/>
-    </task>
-    <task name="Gets2" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set count="5" name="ThinClientHA2"/>
-    </task>
-    <task name="Gets3" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set count="5" name="ThinClientHA3"/>
-    </task>
-    <task name="Puts1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClientHA1"/>
-    </task>
-    <task name="Puts2" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClientHA2"/>
-    </task>
-    <task name="Puts3" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClientHA3"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]"/>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
deleted file mode 100644
index 9d20604..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
deleted file mode 100644
index ee28e8e..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]"> 
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
deleted file mode 100644
index 50abb7d..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">3</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
deleted file mode 100644
index 5e97c8e..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
deleted file mode 100644
index 82e1706..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml b/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml
deleted file mode 100644
index b56bd45..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">3</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <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/NativePR/CyberTraderInterestListUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/CyberTraderInterestListUpdateTest.xml b/src/tests/cpp/xml/Generics/NativePR/CyberTraderInterestListUpdateTest.xml
deleted file mode 100644
index f66b761..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/CyberTraderInterestListUpdateTest.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1848</item>
-    </list>
-  </data>
-  <data name="expectedCount">1848</data>
-
-  <data name="valueSizes">
-    <list>
-      <item>3000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <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">-c 6 NativePR/csConflationNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Gets Entries in Subscriber" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableIntTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableIntTest2.xml b/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableIntTest2.xml
deleted file mode 100644
index 507a4d1..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableIntTest2.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>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">int</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 with puts and gets for keyType int">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 NativePR/csNotifySubscription.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="CreateRegionForPerformanceVariable" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <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>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest.xml b/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest.xml
deleted file mode 100644
index ac7399d..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</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="JCS6" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test with puts for mixed keyType">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 NativePR/csNotifySubscription.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keyType">int</data>
-    </task>
-    <task name="LocalDestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="90m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest2.xml b/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest2.xml
deleted file mode 100644
index 9022f12..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/CyberTraderPerfVariableTest2.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>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>
-
-  <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="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test with puts and gets for keyType string">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativePR/csNotifySubscription.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="CreateRegionForPerformanceVariable" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <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="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="Measure Performance Variable with cache size with 3rd cache member" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size with 3rd cache member" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="90m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <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/NativePR/clientEventsFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/clientEventsFailover.xml b/src/tests/cpp/xml/Generics/NativePR/clientEventsFailover.xml
deleted file mode 100644
index f2da0b7..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/clientEventsFailover.xml
+++ /dev/null
@@ -1,167 +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="redundancyLevel">1</data>
-  
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>stop</item>
-      <item>stop</item>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="30" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativePR/csNotifySubscription.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="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="30" name="Client"/>
-    </task>    
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="String,byte[]">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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/NativePR/csConflationNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/csConflationNotifySubscription.xml b/src/tests/cpp/xml/Generics/NativePR/csConflationNotifySubscription.xml
deleted file mode 100644
index a2bfee0..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/csConflationNotifySubscription.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 enable-subscription-conflation="true">
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativePR/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativePR/csNotifySubscription.xml b/src/tests/cpp/xml/Generics/NativePR/csNotifySubscription.xml
deleted file mode 100644
index 963cea2..0000000
--- a/src/tests/cpp/xml/Generics/NativePR/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="1"/>
-    </region-attributes>
-  </region>
-</cache> 


[32/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/clientEventsFailoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/clientEventsFailoverQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQuery/clientEventsFailoverQueryTest.xml
deleted file mode 100644
index d7f900d..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/clientEventsFailoverQueryTest.xml
+++ /dev/null
@@ -1,207 +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="redundancyLevel">1</data>
-  <data name="minServers">2</data>
- 
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="entryCount">10000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  
-  <client-set name="Feeder"/>
-  <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="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <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" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Position">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Position">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Position">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2h10m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>query</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">20m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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/RemoteQuery/clientEventsQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/clientEventsQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQuery/clientEventsQueryTest.xml
deleted file mode 100644
index d90671e..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/clientEventsQueryTest.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="entryCount">10000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    
-     <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Position">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Position">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Position">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="1h" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>query</item>
-        </oneof>
-      </data>
-      <data name="workTime">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/csAckMirror.xml b/src/tests/cpp/xml/Generics/RemoteQuery/csAckMirror.xml
deleted file mode 100644
index d674b48..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/csAckMirror.xml
+++ /dev/null
@@ -1,115 +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="dummyRegion">
-    <region-attributes scope="distributed-ack" data-policy="replicate" concurrency-checks-enabled="true"/>
-     <entry>
-       <key><string>port1_1</string></key>
-       <value>
-         <declarable>
-           <class-name>javaobject.Portfolio</class-name>
-           <parameter name="ID">
-             <string>1</string>
-           </parameter>
-         </declarable>
-       </value>
-     </entry>
-  </region>
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <!--class-name>javaobject.newapi.Portfolio</class-name-->
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>1</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-            </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-     <region name="Positions">
-       <region-attributes scope="distributed-ack" data-policy="replicate">
-         <eviction-attributes>
-           <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-         </eviction-attributes>
-       </region-attributes>
-     </region>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-  <region name="Portfolios3">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-  <region name="Positions">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/csNotifySubscription.xml b/src/tests/cpp/xml/Generics/RemoteQuery/csNotifySubscription.xml
deleted file mode 100644
index ed8cd03..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/csNotifySubscription.xml
+++ /dev/null
@@ -1,71 +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="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>1</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-            </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/csServerEviction.xml b/src/tests/cpp/xml/Generics/RemoteQuery/csServerEviction.xml
deleted file mode 100644
index d286524..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/csServerEviction.xml
+++ /dev/null
@@ -1,71 +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="Portfolios">
-    <region-attributes scope="distributed-ack">
-      <eviction-attributes>
-        <lru-entry-count maximum="1000"/>
-      </eviction-attributes>
-    </region-attributes>
-      <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>1</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-             </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/csServerOverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/csServerOverflowToDisk.xml b/src/tests/cpp/xml/Generics/RemoteQuery/csServerOverflowToDisk.xml
deleted file mode 100644
index b64cfc4..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/csServerOverflowToDisk.xml
+++ /dev/null
@@ -1,71 +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="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate" persist-backup="true">
-      <eviction-attributes>
-        <lru-entry-count maximum="1000" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>1</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-             </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/csWithIndex.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/csWithIndex.xml b/src/tests/cpp/xml/Generics/RemoteQuery/csWithIndex.xml
deleted file mode 100644
index 1ae36f4..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/csWithIndex.xml
+++ /dev/null
@@ -1,95 +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" maximum-time-between-pings="600000" />
-  <region name="IndexRegion">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>76343</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-            </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-  <region name="Portfolios">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index1" type="range" from-clause="/Portfolios" expression="ID" />
-    <index name="index5" type="range" from-clause="/Portfolios.keys" expression="toString" />
-    <index name="index7" type="range" from-clause="/Portfolios.values k" expression="nvl(k.position2.toString(),'nopes')" />
-    <index name="index8" type="range" from-clause="/Portfolios.keys k" expression="k" />
-    <region name="Positions">
-      <region-attributes scope="distributed-ack" data-policy="replicate">
-      </region-attributes>
-    </region>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index2" type="range" from-clause="/Portfolios2" expression="ID" />
-  </region>
-  <region name="Portfolios3">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index3" type="range" from-clause="/Portfolios3" expression="ID" />
-  </region>
-  <region name="Positions">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index4" type="range" from-clause="/Positions" expression="secId" />
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/dataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/dataValidationQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQuery/dataValidationQueryTest.xml
deleted file mode 100644
index 4f7c3c5..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/dataValidationQueryTest.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>2</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Position">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Position">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" continueOnError="true" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" continueOnError="true" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/distributedDataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/distributedDataValidationQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQuery/distributedDataValidationQueryTest.xml
deleted file mode 100644
index 16725e1..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/distributedDataValidationQueryTest.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>2</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="client1"/>
-  <client-set name="client2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="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" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="string,portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="client1"/>
-      <client-set name="client2"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="client1"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="client1"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="client1"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Position">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="client1"/>
-      <client-set name="client2"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Position">
-      <data name="regionName">Positions</data>
-      <client-set name="client1"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,Portfolio">
-      <client-set name="client2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,Portfolio">
-      <client-set name="client2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="Running Param Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,Portfolio">
-      <client-set name="client2"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,Portfolio">
-      <client-set name="client2"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="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" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/entryOperationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/entryOperationQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQuery/entryOperationQueryTest.xml
deleted file mode 100644
index 45496e1..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/entryOperationQueryTest.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>10000</item>
-          <item>500</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>9500</item>
-          <item>475</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/failoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/failoverQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQuery/failoverQueryTest.xml
deleted file mode 100644
index 6a8810e..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/failoverQueryTest.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  	
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-	
-  <data name="sleepTime">
-    <oneof>
-      <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="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  
-  <data name="minServers">1</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-	
-  <test name="QueryFailoverTest" description="Thin Client perf test">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegion" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="3m" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="10" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="1h" parallel="true" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="1h" parallel="true" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="Running Param Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/regexAndQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/regexAndQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQuery/regexAndQueryTest.xml
deleted file mode 100644
index cc7eb7b..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/regexAndQueryTest.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">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="ThinClient1"/>
-  <client-set name="ThinClient2"/>
-
-  <test name="ThinClientRegexNQuery" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Populate Entries in ThinClient1" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Gets" action="doGetObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,Portfolio">
-      <data name="registerRegex">port.*</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="ThinClient2"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Update Entries from ThinClient1" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="45m" parallel="true" argTypes="String,Portfolio">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-          <item>500</item>
-          <item>1000</item>
-          <item>10000</item>
-        </list>
-      </data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="45m" parallel="true" argTypes="String,Portfolio">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="45m" parallel="true" argTypes="String,Portfolio">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/serverEvictionQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/serverEvictionQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQuery/serverEvictionQueryTest.xml
deleted file mode 100644
index 81b6172..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/serverEvictionQueryTest.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csServerEviction.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for result set test" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQuery/serverOverflowToDiskQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQuery/serverOverflowToDiskQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQuery/serverOverflowToDiskQueryTest.xml
deleted file mode 100644
index 8083abd..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQuery/serverOverflowToDiskQueryTest.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csServerOverflowToDisk.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsFailoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsFailoverQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsFailoverQueryTest.xml
deleted file mode 100644
index 8e40c93..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsFailoverQueryTest.xml
+++ /dev/null
@@ -1,209 +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="redundancyLevel">1</data>
-  <data name="minServers">4</data>
- 
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="entryCount">1000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  <data name="unsupportedPRQuery">true</data>
-
-  <client-set name="Feeder"/>
-  <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="JCS6" hostGroup="CS"/>
-  <client-set count="30" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csWithIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csWithOutIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <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" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2h10m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>query</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">20m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 5" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="2m" argTypes="String,Portfolio"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-
-  </test>
-</test-driver>


[09/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/clientEventsFailoverCB.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientEventsFailoverCB.xml b/src/tests/cpp/xml/Native/clientEventsFailoverCB.xml
deleted file mode 100755
index 300e029..0000000
--- a/src/tests/cpp/xml/Native/clientEventsFailoverCB.xml
+++ /dev/null
@@ -1,344 +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="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-   
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-        <!--region-attributes caching-enabled="true" client-notification="true"-->
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="1" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Native/csAckMirror.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="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="1" name="Client"/>
-    </task>    
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="30m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>putAllCB</item>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>getAllCB</item>
-          <item>update</item>
-          <item>removeAll</item>
-          <item>read</item>
-          <item>removeAllCB</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <!--client-set name="Feeder"/-->
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-<?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="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-   
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-        <!--region-attributes caching-enabled="true" client-notification="true"-->
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="1" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Native/csAckMirror.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="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="1" name="Client"/>
-    </task>    
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="30m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>putAllCB</item>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>getAllCB</item>
-          <item>update</item>
-          <item>removeAll</item>
-          <item>read</item>
-          <item>removeAllCB</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <!--client-set name="Feeder"/-->
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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/Native/clientEventsFailoverSticky.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientEventsFailoverSticky.xml b/src/tests/cpp/xml/Native/clientEventsFailoverSticky.xml
deleted file mode 100644
index 3bbb890..0000000
--- a/src/tests/cpp/xml/Native/clientEventsFailoverSticky.xml
+++ /dev/null
@@ -1,176 +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="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-   
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false" pool-name="_Test_Pool1"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true" pool-name="_Test_Pool1">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-  
-  <data name="ThinClientPool1">
-     <snippet>
-       <pool name="_Test_Pool1" subscription-enabled="true" locators="true" thread-local-connections="true" max-connections="15" />
-     </snippet>
-  </data>
-  
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Native/csAckMirror.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="CreatePool1" action="doCreatePool" container="perftests" waitTime="3m">
-          <data name="poolSpec">ThinClientPool1</data>
-          <client-set count="10" name="Client"/>
-          <client-set name="Feeder"/>
-    </task>
-    
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="10" name="Client"/>
-    </task>    
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="30m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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/Native/clientEventsHLRU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientEventsHLRU.xml b/src/tests/cpp/xml/Native/clientEventsHLRU.xml
deleted file mode 100644
index 586b745..0000000
--- a/src/tests/cpp/xml/Native/clientEventsHLRU.xml
+++ /dev/null
@@ -1,61 +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="heapLruLimit">200</data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  
-  <data name="useDistinctKeys">true</data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set count="10" name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 1 Native/csHlru.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="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="10" name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryEvents" container="eventtest" waitTime="20m">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">100</data>
-      <client-set count="10" name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/clientPayloadScalability.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientPayloadScalability.xml b/src/tests/cpp/xml/Native/clientPayloadScalability.xml
deleted file mode 100644
index d402446..0000000
--- a/src/tests/cpp/xml/Native/clientPayloadScalability.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-
-  <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="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>5120</item>
-          <item>10240</item>
-          <item>512000</item>
-          <item>102400</item>
-          <item>5242880</item>
-          <item>10485760</item>
-          <item>31457280</item>
-          <item>52428800</item>
-          <item>73400320</item>
-          <item>104857600</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>209715200</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>314572800</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>419430400</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>524288000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </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="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/clientQConflationNoServerConflation.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientQConflationNoServerConflation.xml b/src/tests/cpp/xml/Native/clientQConflationNoServerConflation.xml
deleted file mode 100644
index 5dab9bf..0000000
--- a/src/tests/cpp/xml/Native/clientQConflationNoServerConflation.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="conflate">true</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionDurable">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="30" name="ThinClient"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientQConflationTest" description="Thin Client Q Conflation test with server conflation setting disabled">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p \"-J-DslowStartTimeForTesting=170000\" -c 3 Native/csAckMirrorNoConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion with conflation setting yes" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion with conflation setting no" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion with conflation setting server" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation on" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting no" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting server" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="5m">
-      <client-set begin="1" count="15" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys for durable client" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set begin="16" count="15" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="30m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="update" action="doPopulateRegion" container="perftests" timesToRun="350" waitTime="60m">
-      <client-set name="Feeder"/>
-      <data name="valueSizes">20</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="550">
-      <client-set count="30" name="ThinClient"/>
-      <data name="sleepTime">300</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-      <data name="isServerConflateTrue">false</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-      <data name="isServerConflateTrue">false</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <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/Native/clientQConflationNoServerConflationFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientQConflationNoServerConflationFailover.xml b/src/tests/cpp/xml/Native/clientQConflationNoServerConflationFailover.xml
deleted file mode 100644
index ba66af8..0000000
--- a/src/tests/cpp/xml/Native/clientQConflationNoServerConflationFailover.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="conflate">true</data>
-  <data name="redundancyLevel">2</data>
-  <data name="minServers">3</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <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="keyType">int</data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionDurable">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="30" name="ThinClient"/>
-  <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="Feeder"/>
-
-  <test name="ThinClientQConflationTest" description="Thin Client Q conflation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p \"-J-DslowStartTimeForTesting=60000\" -c 5 Native/csAckMirrorNoConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="CreateRegion with conflation setting yes" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion with conflation setting no" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion with conflation setting server" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation on" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting no" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting server" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="5m">
-      <client-set begin="1" count="15" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys for durable client" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set begin="16" count="15" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="30m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="update" action="doPopulateRegion" container="perftests" timesToRun="350"  continueOnError="true" parallel="true" waitTime="60m">
-      <client-set name="Feeder"/>
-      <data name="valueSizes">20</data>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="360">
-      <data name="sleepTime">300</data>
-    </task>
-    <!--task name="validate conflation with client conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task-->
-    <task name="validate conflation with client conflation off" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with client conflation as server" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-      <data name="isServerConflateTrue">false</data>
-    </task>
-    <!--task name="validate conflation with durable client conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task-->
-    <task name="validate conflation with durable client conflation off" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with durable client conflation as server" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-      <data name="isServerConflateTrue">false</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <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/Native/clientQConflationServerConflation.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientQConflationServerConflation.xml b/src/tests/cpp/xml/Native/clientQConflationServerConflation.xml
deleted file mode 100644
index 5b2c4ef..0000000
--- a/src/tests/cpp/xml/Native/clientQConflationServerConflation.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="conflate">true</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionDurable">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="30" name="ThinClient"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientQConflationTest" description="Thin Client Q conflation test with server conflation setting enabled">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p \"-J-DslowStartTimeForTesting=170000\" -c 3 Native/csAckMirrorConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion with conflation setting yes" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion with conflation setting no" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion with conflation setting server" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation on" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting no" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting server" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="5m">
-      <client-set begin="1" count="15" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys for durable client" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set begin="16" count="15" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="30m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="update" action="doPopulateRegion" container="perftests" timesToRun="350" waitTime="60m">
-      <client-set name="Feeder"/>
-      <data name="valueSizes">20</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="550">
-      <client-set count="30" name="ThinClient"/>
-      <data name="sleepTime">300</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-      <data name="isServerConflateTrue">true</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-      <data name="isServerConflateTrue">true</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <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/Native/clientQConflationServerConflationFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientQConflationServerConflationFailover.xml b/src/tests/cpp/xml/Native/clientQConflationServerConflationFailover.xml
deleted file mode 100644
index 123f364..0000000
--- a/src/tests/cpp/xml/Native/clientQConflationServerConflationFailover.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="conflate">true</data>
-  <data name="redundancyLevel">2</data>
-  <data name="minServers">4</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <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="keyType">int</data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-          <!--cache-listener library="perftests" function="createPerfTestCacheListener"/-->
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionDurable">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="30" name="ThinClient"/>
-  <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="JCS6" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientQConflationTest" description="Thin Client Q conflation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p \"-J-DslowStartTimeForTesting=60000\" -c 6 Native/csAckMirrorConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="CreateRegion with conflation setting yes" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion with conflation setting no" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion with conflation setting server" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation on" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting no" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting server" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="5m">
-      <client-set begin="1" count="15" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys for durable client" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set begin="16" count="15" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="30m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="update" action="doPopulateRegion" container="perftests" timesToRun="350"  continueOnError="true" parallel="true" waitTime="60m">
-      <client-set name="Feeder"/>
-      <data name="valueSizes">20</data>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="stopStartCacheServer 6" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="360">
-      <data name="sleepTime">300</data>
-    </task>
-    <!--task name="validate conflation with client conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task-->
-    <task name="validate conflation with client conflation off" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <!--task name="validate conflation with client conflation as server" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-      <data name="isServerConflateTrue">true</data>
-    </task>
-    <task name="validate conflation with durable client conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task-->
-    <task name="validate conflation with durable client conflation off" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <!--task name="validate conflation with durable client conflation as server" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-      <data name="isServerConflateTrue">true</data>
-    </task-->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/clientScalabilityMultiServerTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientScalabilityMultiServerTest.xml b/src/tests/cpp/xml/Native/clientScalabilityMultiServerTest.xml
deleted file mode 100755
index cb0c59c..0000000
--- a/src/tests/cpp/xml/Native/clientScalabilityMultiServerTest.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="distinctKeysForDestroyTask">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="1024" name="ThinClient"/>
-
-  <test name="ClientScalabilityTestWith2server" description="ThinClientRegion client scalability tests with 2 server">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csAckMirror.xml</data>
-      <client-set name="JavaCacheServer"/>
-    </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="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="2" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="1" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="3" count="2" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="3" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="5" count="12" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="5" count="12" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="17" count="16" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="17" count="16" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="33" count="32" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="33" count="32" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="65" count="64" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="65" count="64" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="129" count="128" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="129" count="128" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="257" count="256" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="257" count="256" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="513" count="512" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="513" count="512" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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/Native/clientScalabilityTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientScalabilityTest.xml b/src/tests/cpp/xml/Native/clientScalabilityTest.xml
deleted file mode 100755
index 69d4879..0000000
--- a/src/tests/cpp/xml/Native/clientScalabilityTest.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="distinctKeysForDestroyTask">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JavaCacheServer" hostGroup="CS"/>
-  <client-set count="1024" name="ThinClient"/>
-
-
-  <test name="ClientScalabilityTest" description="ThinClientRegion client scalability tests">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native/csAckMirror.xml</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="2" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="1" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="3" count="2" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="3" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="5" count="12" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="5" count="12" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="17" count="16" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="17" count="16" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="33" count="32" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="33" count="32" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="65" count="64" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="65" count="64" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="129" count="128" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="129" count="128" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="257" count="256" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="257" count="256" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="513" count="512" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="513" count="512" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </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="JavaCacheServer"/>
-    </task>
-  </test>
-</test-driver>


[47/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/34647.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/34647.xml b/src/tests/cpp/xml/Bugs/34647.xml
deleted file mode 100644
index 678f537..0000000
--- a/src/tests/cpp/xml/Bugs/34647.xml
+++ /dev/null
@@ -1,63 +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="systemName">CSTest</data>
-  <data name="cacheType">PEER</data>
-  <data name="scope">ACK</data>
-  <data name="regionName">CSIntelTestRegion</data>
-  <data name="valueSizes">
-		<oneof>
-			<item>100</item>
-			<item>1000</item>
-		</oneof>
-	</data>
-  <data name="entryCount">5000</data>
-  <client-set count="1" name="Feed"/>
-  <client-set count="2" name="Server"/>
-  <client-set count="4" name="Client"/>
-  
-  <test name="IntelTest2" 
-        description="Start a feeder and put data into server caches. Connect clients 
-        and have the clients do gets into a region that caches data. When the feeder 
-        updates keys on the server, the updates are received at the relevant clients 
-        within N time units. N is in milli seconds (Push to clients from servers).
-        And demonstrate the data pushed from the feeder to the server is received at all 
-        servers within a specified time period." 
-        waitTime="10200">
-    <task name="CreateFeeder" action="doCreateRegion" container="cacheserver" waitTime="600">
-      <client-set>
-          <client name="Feeder"/>
-      </client-set>
-     </task>
-    <task name="InitServers" action="doInitProcess" container="cacheserver" waitTime="600">
-      <data name="cacheType">SERVER</data>
-      <client-set count="2" name="Server"/> 
-    </task>
-    <task name="CreateServerRegion" action="createValidationProcess" container="cacheserver" waitTime="600">
-      <client-set count="1" name="Server"/> 
-    </task>
-    <task name="CreateClients" action="createValidationProcess" container="cacheserver" waitTime="600">
-      <data name="cacheType">CLIENT</data>
-      <client-set count="4" name="Client"/> 
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="600">
-      <data name="opsSecond">1200</data>
-      <client-set>
-        <client name="Feeder"/> 
-      </client-set>
-    </task>
-    <task name="ClientsCacheEntries" action="doEntryOperations" container="cacheserver" waitTime="3600">
-      <data name="entryOps">read</data>
-      <data name="workTime">120</data>
-      <data name="opsSecond">12</data>
-      <client-set count="4" name="Client"/> 
-    </task>
-    <task name="FeederUpdates" action="doEntryOperations" container="cacheserver" waitTime="3600">
-      <data name="workTime">60</data>
-      <data name="entryOps">update</data>
-      <client-set>
-        <client name="Feeder"/> 
-      </client-set>
-    </task>    
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/concCQMTTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/concCQMTTest.xml b/src/tests/cpp/xml/CqQuery/concCQMTTest.xml
deleted file mode 100644
index cb8ff60..0000000
--- a/src/tests/cpp/xml/CqQuery/concCQMTTest.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-   <list>
-     <item>10000</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-   <list>
-     <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-   <list>
-     <item>6</item>
-   </list>
-  </data>
-  <data name="keyType">int</data>  
-  <data name="clientCnt">3</data>  
-  <data name="serverCount">2</data>  
-  <data name="cqtest">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-
-  <data name="ThinClientRegion">    
-    <snippet>      
-      <region name="dummyRegion">        
-        <region-attributes caching-enabled="true" client-notification="true">        
-        </region-attributes>      
-      </region>    
-    </snippet>  
-  </data>  
-  <data name="regionSpec">ThinClientRegion</data>
-
- <client-set name="JCS1" hostGroup="CS"/>
- <client-set name="JCS2" hostGroup="CS"/>
- <client-set count="3" name="Client"/>
- <client-set name="Feeder"/>
-
- <test name="conCQBridge" description="Test CQ with a variety of operations with careful validation and concurrent execution with multiple threads">
-   <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-     <data name="program">setupJavaServers</data>
-     <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.xml</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-     <data name="program">startJavaServers</data>
-     <data name="arguments">1</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-     <data name="regionName">dummyRegion</data>
-     <data name="regionSpec">ThinClientRegion</data>
-     <client-set count="3" name="Client"/>
-     <client-set name="Feeder"/>
-   </task>
-   <task name="Register All keys" action="doRegisterAllKeys" container="cacheserver" waitTime="2m">
-     <client-set count="3" name="Client"/>
-   </task>
-   <task name="InitInstance" action="doInitInstance" container="cacheserver" waitTime="20m">
-     <client-set name="Feeder"/>
-     <client-set count="1" name="Client"/>
-   </task>
-   <task name="LoadRegion" action="doFeedInt" container="cacheserver" waitTime="20m">
-     <client-set name="Feeder"/>
-   </task>
-   <task name="Register CQ with executeWithIR " action="doRegisterCqForConc" container="querytests" waitTime="5m">
-     <data name="query">  
-       <list>
-         <item>select * from /dummyRegion</item>
-       </list>
-     </data>
-     <client-set count="3" name="Client"/>
-  </task>
-  <task name="verify queryResults" action="doVerifyQueryResult" container="cacheserver" waitTime="5m">
-    <data name="query">
-      <list>
-        <item>select * from /dummyRegion</item>
-      </list>
-    </data>
-    <client-set count="3" name="Client"/>
-  </task>  
-  <task name="DoOperations in concurrent fashion" action="doRROps" container="cacheserver" waitTime="10m">
-    <data name="query">
-      <list>
-        <item>select * from /dummyRegion</item>
-      </list>
-    </data>
-    <client-set count="1" name="Client"/>
-  </task>
-  <task name="validate entry events against the listener count" action="doValidateEvents" container="querytests" waitTime="5m">
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-  <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-    <data name="program">stopJavaServers</data>
-    <data name="arguments">1</data>
-    <client-set name="JCS1"/>
-  </task>
-  <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-    <data name="program">stopJavaServers</data>
-    <data name="arguments">2</data>
-    <client-set name="JCS2"/>
-  </task>
- </test>
-</test-driver>   

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/cqDurableQS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/cqDurableQS.xml b/src/tests/cpp/xml/CqQuery/cqDurableQS.xml
deleted file mode 100644
index 3d0985e..0000000
--- a/src/tests/cpp/xml/CqQuery/cqDurableQS.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-   <list>
-     <item>100</item>
-   </list>
-  </data>
-
-  <data name="valueSizes">
-   <list>
-     <item>100</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="updateReceiveTime">60</data>
- <data name="registerAndExecuteCQs">true</data>
- <data name="cq">true</data>
- <data name="invalidate">true</data>
-
-<data name="ThinClientRegion">
-  <snippet>
-    <region name="dummyRegion">
-      <region-attributes caching-enabled="true" client-notification="true">
-      </region-attributes>
-    </region>
-  </snippet>
-</data>
-<data name="regionSpec">ThinClientRegion</data>
-<client-set name="JCS1" hostGroup="CS"/>
-<client-set name="JCS2" hostGroup="CS"/>
-<client-set name="Feeder"/>
-<client-set name="DClient1"/>
-<client-set name="NDClient1"/>
-                
-<test name="CqDurableQS" description="Test for testing Cq and Query Service for durable and non durable clients along with event based validation .">
-  <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-    <data name="program">setupJavaServers</data>
-    <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-  <data name="regionName">dummyRegion</data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <client-set name="DClient1"/>
-</task>
-<task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-  <data name="regionName">dummyRegion</data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="isDurable">false</data>
-  <client-set name="NDClient1"/>
-</task>
-<task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-  <data name="regionName">dummyRegion</data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <client-set name="Feeder"/>
-</task>
-<task name="Register All Keys Durable" action="doRegisterAllKeys" container="querytests" waitTime="5m">
-  <client-set name="DClient1"/>
-  <client-set name="Feeder"/>
-  <data name="isDurableReg">true</data>
-</task>
-<task name="Register All Keys Durable" action="doRegisterAllKeys" container="querytests" waitTime="5m">
-  <client-set name="NDClient1"/>
-</task>
-<task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-  <client-set name="DClient1"/>
-  <data name="isDurableC">true</data>
-  <data name="query">
-    <list>
-      <item>select * from /dummyRegion</item>
-    </list>
-   </data>
-</task>
-<task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-  <client-set name="NDClient1"/>
-  <data name="isDurableC">false</data> 
-  <data name="query">
-    <list>
-      <item>select * from /dummyRegion</item>
-    </list>
-  </data>
-</task>
-<!--task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-  <data name="cqState">stopped</data>
-  <client-set name="NDClient1"/>
-  <client-set  name="DClient1"/>
-</task>
-<task name="do random entry ops on portfolio" action="doEntryOperations" container="cacheserver" waitTime="15m" parallel="true">
-  <data name="entryOps">
-    <oneof>
-      <item>add</item>
-      <item>add</item>
-      <item>destroy</item>
-    </oneof>
-  </data>
-  <data name="workTime">1m</data>
-  <data name="opsSecond">5</data>
-  <data name="entryCount">100</data>
-  <data name="valueSizes">100</data>
-  <data name="regionName">dummyRegion</data>
-  <data name="objectType">Portfolio</data>
-  <client-set name="Feeder"/>
-</task>    
-<task name="Validate CQs for DC" action="doValidateCq" container="querytests" waitTime="5m">
-  <client-set name="DClient1"/>
-  <data name="isDurableC">true</data>
-</task>
-<task name="Validate CQs for NDC" action="doValidateCq" container="querytests" waitTime="5m">
-  <client-set name="NDClient1"/>
-  <data name="isDurableC">false</data>
-</task>
-<task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-  <client-set  name="DClient1"/>
-  <client-set name="NDClient1"/>
-  <data name="checkEvents">true</data>
-  <data name="stopped">true</data>
-</task>
-<task name="execute all cqs" action="doCqState" container="querytests" waitTime="5m">
-  <data name="cqState">execute</data>
-  <client-set name="NDClient1"/>
-  <client-set  name="DClient1"/>
-</task-->
-<task name="do random entry ops on portfolio" action="doEntryOperations" container="cacheserver" waitTime="15m" parallel="true">
-  <data name="entryOps">
-    <oneof>
-      <item>add</item>
-      <item>invalidate</item>
-      <item>add</item>
-      <item>add</item>
-      <item>invalidate</item>
-      <item>destroy</item>
-    </oneof>
-  </data>
-  <data name="workTime">3m</data>
-  <data name="opsSecond">5</data>
-  <data name="entryCount">100</data>
-  <data name="valueSizes">100</data>
-  <data name="regionName">dummyRegion</data>
-  <data name="objectType">Portfolio</data>
-  <client-set name="Feeder"/>
-</task>
-<task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
- <client-set  name="DClient1"/>
- <client-set name="NDClient1"/>
- <data name="checkEvents">true</data>
- <data name="execute">true</data>
-</task>
-<task name="Close Cache" action="doCloseCache" container="querytests" waitTime="5m"/>
-<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/CqQuery/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/csAckMirror.xml b/src/tests/cpp/xml/CqQuery/csAckMirror.xml
deleted file mode 100644
index cecbdcb..0000000
--- a/src/tests/cpp/xml/CqQuery/csAckMirror.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/durableCqFailoverR2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/durableCqFailoverR2.xml b/src/tests/cpp/xml/CqQuery/durableCqFailoverR2.xml
deleted file mode 100644
index f738f6d..0000000
--- a/src/tests/cpp/xml/CqQuery/durableCqFailoverR2.xml
+++ /dev/null
@@ -1,208 +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  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 2.  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="minServers">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="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="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableCqFailoverR2" description="Basic test for durable client failover with cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="cacheserver" waitTime="15m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="querytests" waitTime="25m" timesToRun="15" parallel="true">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <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="JCS2"/>
-    </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="JCS2"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/durableTimeoutWithCq.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/durableTimeoutWithCq.xml b/src/tests/cpp/xml/CqQuery/durableTimeoutWithCq.xml
deleted file mode 100644
index f8b8531..0000000
--- a/src/tests/cpp/xml/CqQuery/durableTimeoutWithCq.xml
+++ /dev/null
@@ -1,147 +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  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 1.  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="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="DurableTimeOutCqTest" description="Basic test for durable client timeout with cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="cacheserver" waitTime="15m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="querytests" waitTime="15m" timesToRun="10" parallel="true">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <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/CqQuery/durableWithCqKAFalse.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/durableWithCqKAFalse.xml b/src/tests/cpp/xml/CqQuery/durableWithCqKAFalse.xml
deleted file mode 100644
index ec5b946..0000000
--- a/src/tests/cpp/xml/CqQuery/durableWithCqKAFalse.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-<!-- Description 
-# Servers  1
-# Clients  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = false
-Details  R = 1.  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">false</data>
-  <data name="durableTimeout">120</data>
-  <data name="restartTime">0</data>
-  <data name="updateReceiveTime">60</data>
-  <data name="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableWithCqKAFalse" description="Basic test for durable client with KA false and cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="cacheserver" waitTime="15m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="querytests" waitTime="25m" timesToRun="10" parallel="true">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <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/CqQuery/durableWithCqKATrue.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/durableWithCqKATrue.xml b/src/tests/cpp/xml/CqQuery/durableWithCqKATrue.xml
deleted file mode 100644
index c2e7ba3..0000000
--- a/src/tests/cpp/xml/CqQuery/durableWithCqKATrue.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-<!-- Description 
-# Servers  1
-# Clients  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 1.  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">120</data>
-  <data name="restartTime">0</data>
-  <data name="updateReceiveTime">60</data>
-  <data name="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableWithCqKATrue" description="Basic test for durable client with KA true and cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="cacheserver" waitTime="15m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="querytests" waitTime="25m" timesToRun="10" parallel="true">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <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/CqQuery/multRegCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/multRegCQOps.xml b/src/tests/cpp/xml/CqQuery/multRegCQOps.xml
deleted file mode 100644
index 4b53db4..0000000
--- a/src/tests/cpp/xml/CqQuery/multRegCQOps.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="multRegCQOps" description="multi region cq operation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="querytests" waitTime="15m" parallel="true">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="cacheserver" waitTime="15m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/registerAllKeysGIIValueCqTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/registerAllKeysGIIValueCqTest.xml b/src/tests/cpp/xml/CqQuery/registerAllKeysGIIValueCqTest.xml
deleted file mode 100644
index 265bfcb..0000000
--- a/src/tests/cpp/xml/CqQuery/registerAllKeysGIIValueCqTest.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-	
-  <test name="registerAllKeysGIIValueCQTest" description="registerAllKeyGIIValue with Cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers CS3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register and execute CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set name="Getter1"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="registerAndExecuteCQs">true</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Putter1"/>
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Create Region again" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="getInitialValues">true</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Putter1"/>
-      <data name="valueSizes">
-        <list>
-          <item>300</item>
-        </list>
-      </data>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">300</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Create Region again" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="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="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="Getter1"/>
-      <data name="getInitialValues">true</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">300</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServers CS2" 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/CqQuery/resultSetValidationCQTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/resultSetValidationCQTest.xml b/src/tests/cpp/xml/CqQuery/resultSetValidationCQTest.xml
deleted file mode 100644
index 776321c..0000000
--- a/src/tests/cpp/xml/CqQuery/resultSetValidationCQTest.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  <data name="cq">true</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="resultSetValidationCQTest" description="result set validation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="PopulateRegion /Portfolios/Positions with Position object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">/Portfolios/Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="querytests" waitTime="30m" continueOnError="true">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/serialCQMTTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/serialCQMTTest.xml b/src/tests/cpp/xml/CqQuery/serialCQMTTest.xml
deleted file mode 100644
index 7d4d598..0000000
--- a/src/tests/cpp/xml/CqQuery/serialCQMTTest.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-   <list>
-     <item>10000</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-   <list>
-     <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-   <list>
-     <item>6</item>
-   </list>
-  </data>
-  <data name="keyType">int</data>  
-
-  <!-- clientCnt and serverCount attributes are needed to run the test in serial RR fashion -->
-  <data name="clientCnt">3</data>  
-  <data name="serverCount">2</data>  
-
-  <data name="serialExecution">true</data>  
-  <data name="cqtest">true</data>
-  <data name="executeWithIR">true</data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-
-  <data name="ThinClientRegion">    
-    <snippet>      
-      <region name="dummyRegion">        
-        <region-attributes caching-enabled="true" client-notification="true">        
-        </region-attributes>      
-      </region>    
-    </snippet>  
-  </data>  
-  <data name="regionSpec">ThinClientRegion</data>
-
- <client-set name="JCS1" hostGroup="CS"/>
- <client-set name="JCS2" hostGroup="CS"/>
- <client-set count="3" name="Client"/>
- <client-set name="Feeder"/>
-
- <test name="serialCQBridge" description="Test CQ with a variety of operations with careful validation and serial round-robin execution with multiple threads">
-   <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-     <data name="program">setupJavaServers</data>
-     <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.xml</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-     <data name="program">startJavaServers</data>
-     <data name="arguments">1</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-     <data name="regionName">dummyRegion</data>
-     <data name="regionSpec">ThinClientRegion</data>
-     <client-set count="3" name="Client"/>
-     <client-set name="Feeder"/>
-   </task>
-   <task name="Register All keys" action="doRegisterAllKeys" container="cacheserver" waitTime="2m">
-     <client-set count="3" name="Client"/>
-   </task>
-  <task name="InitInstance" action="doInitInstance" container="cacheserver" waitTime="20m">
-    <client-set name="Feeder"/>
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="LoadRegion" action="doFeedInt" container="cacheserver" waitTime="20m">
-    <client-set name="Feeder"/>
-  </task>
-  <task name="Register CQ with executeWithIR " action="doRegisterCqForConc" container="querytests" waitTime="5m">
-    <data name="query">
-      <list>
-        <item>select * from /dummyRegion</item>
-      </list>
-    </data>
-    <client-set count="3" name="Client"/>
-  </task>  
-  <task name="DoOperations in RR fashion" action="doRROps" container="cacheserver" waitTime="10m">
-    <data name="query">
-      <list>
-         <item>select * from /dummyRegion</item>
-      </list>
-    </data>
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="validate entry events against the listener count" action="doValidateEvents" container="querytests" waitTime="5m">
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-  <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-    <data name="program">stopJavaServers</data>
-    <data name="arguments">1</data>
-    <client-set name="JCS1"/>
-  </task>
-  <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-    <data name="program">stopJavaServers</data>
-    <data name="arguments">2</data>
-    <client-set name="JCS2"/>
-  </task>
- </test>
-</test-driver>   
-                    
-                                        
-

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/CqQuery/serialEntryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/CqQuery/serialEntryEvent.xml b/src/tests/cpp/xml/CqQuery/serialEntryEvent.xml
deleted file mode 100644
index 7294751..0000000
--- a/src/tests/cpp/xml/CqQuery/serialEntryEvent.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEvent" description="doing operations serially">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="5m">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="UpdateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="querytests" waitTime="15m">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>50</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="querytests" waitTime="15m">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-          <item>45</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="querytests" waitTime="10m">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="querytests" waitTime="15m">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>50</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="querytests" waitTime="10m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="querytests" waitTime="5m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="querytests" waitTime="5m">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>


[20/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/perf.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/perf.list b/src/tests/cpp/xml/Generics/perf.list
deleted file mode 100644
index 06d0865..0000000
--- a/src/tests/cpp/xml/Generics/perf.list
+++ /dev/null
@@ -1,43 +0,0 @@
-# per073,075,096,097.100 were with depricated old endpoint, so have been remeoved from the perf.list  
-Generics/smoketest/perf/perf016.xml
-Generics/smoketest/perf/perf017.xml
-Generics/smoketest/perf/perf061.xml
-Generics/smoketest/perf/perf062.xml
-Generics/smoketest/perf/perf063.xml
-Generics/smoketest/perf/perf064.xml
-Generics/smoketest/perf/perf065.xml
-Generics/smoketest/perf/perf067.xml
-Generics/smoketest/perf/perf068.xml
-Generics/smoketest/perf/perf069.xml
-Generics/smoketest/perf/perf070.xml
-Generics/smoketest/perf/perf071.xml
-Generics/smoketest/perf/perf074.xml
-Generics/smoketest/perf/perf077.xml
-Generics/smoketest/perf/perf078.xml
-Generics/smoketest/perf/perf079.xml
-Generics/smoketest/perf/perf082.xml
-Generics/smoketest/perf/perf083.xml
-Generics/smoketest/perf/perf090.xml
-Generics/smoketest/perf/perf091.xml
-Generics/smoketest/perf/perf092.xml
-Generics/smoketest/perf/perf098.xml
-Generics/smoketest/perf/perf102.xml
-Generics/smoketest/perf/perf103.xml
-Generics/smoketest/perf/perf104.xml
-Generics/smoketest/perf/perf105.xml
-Generics/smoketest/perf/perf106.xml
-Generics/smoketest/perf/perf107.xml
-Generics/smoketest/perf/perf108.xml
-Generics/smoketest/perf/perf109.xml
-Generics/smoketest/perf/perf110.xml
-Generics/smoketest/perf/perf111.xml
-Generics/smoketest/perf/perf112.xml
-Generics/smoketest/perf/perf113.xml
-Generics/smoketest/perf/perf114.xml
-Generics/smoketest/perf/perf115.xml
-Generics/smoketest/perf/perf148.xml
-Generics/smoketest/perf/perf149.xml
-Generics/smoketest/perf/perf150.xml
-Generics/smoketest/perf/perf152.xml
-Generics/smoketest/perf/perf153.xml
-Generics/smoketest/perf/perf154.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/remoteQueryNightly.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/remoteQueryNightly.list b/src/tests/cpp/xml/Generics/remoteQueryNightly.list
deleted file mode 100644
index d591c13..0000000
--- a/src/tests/cpp/xml/Generics/remoteQueryNightly.list
+++ /dev/null
@@ -1,10 +0,0 @@
-Generics/RemoteQuery/distributedDataValidationQueryTest.xml
-Generics/RemoteQuery/entryOperationQueryTest.xml
-Generics/RemoteQuery/dataValidationQueryTest.xml
-Generics/RemoteQuery/serverEvictionQueryTest.xml
-Generics/RemoteQuery/serverOverflowToDiskQueryTest.xml
-Generics/RemoteQuery/clientEventsQueryTest.xml
-Generics/RemoteQuery/clientEventsFailoverQueryTest.xml
-Generics/RemoteQuery/failoverQueryTest.xml
-Generics/RemoteQuery/regexAndQueryTest.xml
-Generics/RemoteQuery/concQuery.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/remoteQueryNightlyPR.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/remoteQueryNightlyPR.list b/src/tests/cpp/xml/Generics/remoteQueryNightlyPR.list
deleted file mode 100644
index e9a9869..0000000
--- a/src/tests/cpp/xml/Generics/remoteQueryNightlyPR.list
+++ /dev/null
@@ -1,8 +0,0 @@
-Generics/RemoteQueryPR/distributedDataValidationQueryTest.xml
-Generics/RemoteQueryPR/entryOperationQueryTest.xml
-Generics/RemoteQueryPR/dataValidationQueryTest.xml
-Generics/RemoteQueryPR/serverEvictionQueryTest.xml
-Generics/RemoteQueryPR/clientEventsQueryTest.xml
-Generics/RemoteQueryPR/regexAndQueryTest.xml
-Generics/RemoteQueryPR/failoverQueryTest.xml
-Generics/RemoteQueryPR/clientEventsFailoverQueryTest.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/scale.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/scale.list b/src/tests/cpp/xml/Generics/scale.list
deleted file mode 100644
index fdd9b4d..0000000
--- a/src/tests/cpp/xml/Generics/scale.list
+++ /dev/null
@@ -1,36 +0,0 @@
-Generics/smoketest/scale/scale047.xml
-Generics/smoketest/scale/scale048.xml
-Generics/smoketest/scale/scale049.xml
-Generics/smoketest/scale/scale050.xml
-Generics/smoketest/scale/scale051.xml
-Generics/smoketest/scale/scale052.xml
-Generics/smoketest/scale/scale053.xml
-Generics/smoketest/scale/scale054.xml
-Generics/smoketest/scale/scale055.xml
-Generics/smoketest/scale/scale056.xml
-Generics/smoketest/scale/scale057.xml
-Generics/smoketest/scale/scale058.xml
-Generics/smoketest/scale/scale059.xml
-Generics/smoketest/scale/scale060.xml
-Generics/smoketest/scale/scale061.xml
-Generics/smoketest/scale/scale062.xml
-Generics/smoketest/scale/scale063.xml
-Generics/smoketest/scale/scale064.xml
-Generics/smoketest/scale/scale065.xml
-Generics/smoketest/scale/scale066.xml
-Generics/smoketest/scale/scale071.xml
-Generics/smoketest/scale/scale072.xml
-Generics/smoketest/scale/scale073.xml
-Generics/smoketest/scale/scale074.xml
-Generics/smoketest/scale/scale075.xml
-Generics/smoketest/scale/scale076.xml
-Generics/smoketest/scale/scale077.xml
-Generics/smoketest/scale/scale078.xml
-Generics/smoketest/scale/scale079.xml
-Generics/smoketest/scale/scale080.xml
-Generics/smoketest/scale/scale081.xml
-Generics/smoketest/scale/scale082.xml
-Generics/smoketest/scale/scale083.xml
-Generics/smoketest/scale/scale084.xml
-Generics/smoketest/scale/scale085.xml
-Generics/smoketest/scale/scale086.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/securityNightly.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/securityNightly.list b/src/tests/cpp/xml/Generics/securityNightly.list
deleted file mode 100644
index 66d8f19..0000000
--- a/src/tests/cpp/xml/Generics/securityNightly.list
+++ /dev/null
@@ -1,9 +0,0 @@
-Generics/Security/Native/clientAuthnAndAuthzTestMU.xml
-Generics/Security/Native/clientAuthnAndAuthzTestFailoverMU.xml
-Generics/Security/Native/clientAuthnAndAuthzTest.xml
-Generics/Security/Native/multiUserDurableCQ.xml
-Generics/Security/Native/clientAuthnAndAuthzFailoverTest.xml
-Generics/Security/NativePR/clientAuthnAndAuthzPrMU.xml
-Generics/Security/NativePR/clientAuthnAndAuthzFailoverPrMU.xml
-Generics/Security/NativePR/clientAuthnAndAuthzPrTest.xml
-Generics/Security/NativePR/clientAuthnAndAuthzFailoverPrTest.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/getobject.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/getobject.xml b/src/tests/cpp/xml/Generics/smoketest/perf/getobject.xml
deleted file mode 100644
index ca7a4d3..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/getobject.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">180</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        <cache-listener library="smokeperf" function="createLatencyListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        <cache-listener library="smokeperf" function="createLatencyListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-
-  <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">-t JCS1 Native/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t JCS2 Native/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t JCS1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t JCS2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="smokeperf" waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="smokeperf" waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="TAG">JCS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="smokeperf" waitTime="5m">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <data name="TAG">JCS2</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="smokeperf" waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set begin="2" count="1" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="smokeperf" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <!--task name="getEntries in Region" action="doGetKeys" container="smokeperf" waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set begin="2" count="1" name="Client"/>
-    </task-->
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set name="Client"/>
-      <data name="sleepTime">30</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="smokeperf" waitTime="2m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t JCS1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t JCS2</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/smoketest/perf/perf016.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf016.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf016.xml
deleted file mode 100644
index 8530775..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf016.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">600</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="contactNum">1</data>
-  <data name="putPercentage">20</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" max-connections="8" read-timeout="100000" 
-           subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" lru-entries-limit="6250" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf016" description="Edge clients do 80% fetches and and 20% updates on entries from replicated servers.  Clients use LRU memory size with 25% of the objects held locally and action local destroy.  Runs on two hosts.  Entries are DataSerializable PSTObjects with byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <!--data name="arguments">-t JCS1 Native/csAckMirror.xml</data-->
-      <data name="arguments">-c 2 smoketest/perf/csAckMirrorNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="MixPutGet Operations on Region" action="doMixPutGetDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkload">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf016.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf017.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf017.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf017.xml
deleted file mode 100644
index 776925e..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf017.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">600</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="contactNum">1</data>
-  <data name="putPercentage">20</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" max-connections="8" read-timeout="100000" 
-           subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf017" description="Edge clients do 80% fetches and and 20% updates on entries from partitioned servers.  Runs on two hosts.  Entries are DataSerializable PSTObjects with byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csPRNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="MixPutGet Operations on Region" action="doMixPutGetDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkload">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf016.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf061.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf061.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf061.xml
deleted file mode 100644
index 9d3e708..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf061.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf061" description="Empty edge clients update entries on server.  Does not use selector.  Runs on two hosts. 
-     Entries are byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf061.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf062.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf062.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf062.xml
deleted file mode 100644
index c72a5aa..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf062.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf062" description="Empty edge clients update entries on server. Uses selector.  Runs on two hosts. 
-     Entries are byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalseSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <!--task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task-->
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf061.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf063.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf063.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf063.xml
deleted file mode 100644
index 94a9cec..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf063.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>102400</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf063" description="Empty edge clients update entries on server.  Does not use selector.  Runs on two hosts. 
-     Entries are byte arrays of size 102400">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf061.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf064.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf064.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf064.xml
deleted file mode 100644
index 8da3006..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf064.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>102400</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf064" description="Empty edge clients update entries on server.  Uses selector.  Runs on two hosts. 
-     Entries are byte arrays of size 102400">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalseSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf061.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf065.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf065.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf065.xml
deleted file mode 100644
index 5b3747b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf065.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf065" description="Empty edge clients update entries on server.  Does not use selector.  Runs on two hosts. 
-     Entries are DataSerializable PSTObjects with byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf061.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf067.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf067.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf067.xml
deleted file mode 100644
index 735397f..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf067.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf067" description="Empty edge clients fetch entries on server.  Does not use selector.  Runs on two hosts. 
-     Entries are byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="fetch entries on server" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf067.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf068.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf068.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf068.xml
deleted file mode 100644
index 13af4b9..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf068.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf068" description="Empty edge clients fetch entries on server.  Uses selector.  Runs on two hosts. 
-     Entries are byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalseSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="fetch entries on server" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf067.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf069.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf069.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf069.xml
deleted file mode 100644
index f2b4611..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf069.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>102400</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf069" description="Empty edge clients fetch entries on server.  Does not use selector.  Runs on two hosts. 
-     Entries are byte arrays of size 102400">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="fetch entries on server" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf067.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf070.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf070.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf070.xml
deleted file mode 100644
index 680ee3f..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf070.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>102400</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf070" description="Empty edge clients fetch entries on server.  Uses selector.  Runs on two hosts. 
-     Entries are byte arrays of size 102400">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalseSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="fetch entries on server" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf067.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf071.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf071.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf071.xml
deleted file mode 100644
index 3937c2a..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf071.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>102400</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf071" description="Empty edge clients fetch entries on server.  Does not use selector.  Runs on two hosts. 
-     Entries are DataSerializable PSTObjects with byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="fetch entries on server" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf067.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf073.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf073.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf073.xml
deleted file mode 100644
index 46d2b54..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf073.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false">
-         <cache-loader library="smokeperf" function="createCacheLoader"/>
-         </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="regionName">TestTCR1</data>
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf073" description="Empty edge clients create and close a region.  Does not use selector. 
-    Runs on two hosts.  Measures time to connect to server when throttled by 20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="cycleBridgeConnectionTask" action="doCycleBridgeConnectionTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <client-set count="1" name="Client"/>
-      <data name="isMainWorkLoad">true</data>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf074.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf074.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf074.xml
deleted file mode 100644
index 3fb34cd..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf074.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="1" max-connections="1"  subscription-redundancy="0" locators="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf074" description="Edge clients create and close a connection pool using autodiscovery.  Uses selector.  
-    Runs on two hosts.  Measures time to connect to server when throttled by 20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalseSelector1.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf075.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf075.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf075.xml
deleted file mode 100644
index f7015a2..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf075.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-         <cache-loader library="smokeperf"  function="createCacheLoader"/>
-         </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="clientCount">1</data>
-  <data name="regionName">TestTCR1</data>
-  <data name="sleepMs">20</data>
-  <data name="clientNotification">true</data>
-  <data name="connectionPoolSize">1</data>
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf075" description="Empty edge clients create and close a region.  Uses selector. 
-    Runs on two hosts.  Measures time to connect to server when throttled by 20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalseSelector1.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="cycleBridgeConnectionTask" action="doCycleBridgeConnectionTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>


[37/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestWithHLRU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestWithHLRU.xml b/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestWithHLRU.xml
deleted file mode 100644
index efb0643..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestWithHLRU.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>
-
-  <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 with puts and gets for keyType string">
-    <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size with 3rd cache member" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-
-    <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/Native/clientEvents.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/clientEvents.xml b/src/tests/cpp/xml/Generics/Native/clientEvents.xml
deleted file mode 100644
index 2d01723..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientEvents.xml
+++ /dev/null
@@ -1,107 +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="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" 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="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="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="String,byte[]">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2h10m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/clientEventsFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/clientEventsFailover.xml b/src/tests/cpp/xml/Generics/Native/clientEventsFailover.xml
deleted file mode 100644
index d875692..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientEventsFailover.xml
+++ /dev/null
@@ -1,163 +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="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-   
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Native/csAckMirror.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="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="20" name="Client"/>
-    </task>    
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="String,byte[]">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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/Native/clientQConflationNoServerConflation.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/clientQConflationNoServerConflation.xml b/src/tests/cpp/xml/Generics/Native/clientQConflationNoServerConflation.xml
deleted file mode 100644
index 9fe14fc..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientQConflationNoServerConflation.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="conflate">true</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionDurable">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListenerDC"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="30" name="ThinClient"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientQConflationTest" description="Thin Client Q Conflation test with server conflation setting disabled">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p \"-J-DslowStartTimeForTesting=170000\" -c 3 Native/csAckMirrorNoConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion with conflation setting yes" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion with conflation setting no" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion with conflation setting server" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation on" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting no" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting server" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="1" count="15" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys for durable client" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="15" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="update" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" timesToRun="350" waitTime="60m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-      <data name="valueSizes">20</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="550">
-      <client-set count="30" name="ThinClient"/>
-      <data name="sleepTime">300</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-      <data name="isServerConflateTrue">false</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-      <data name="isServerConflateTrue">false</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <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/Native/clientQConflationNoServerConflationFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/clientQConflationNoServerConflationFailover.xml b/src/tests/cpp/xml/Generics/Native/clientQConflationNoServerConflationFailover.xml
deleted file mode 100644
index 5eb7889..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientQConflationNoServerConflationFailover.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="conflate">true</data>
-  <data name="redundancyLevel">2</data>
-  <data name="minServers">3</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <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="keyType">int</data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionDurable">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListenerDC"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="30" name="ThinClient"/>
-  <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="Feeder"/>
-
-  <test name="ThinClientQConflationTest" description="Thin Client Q conflation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p \"-J-DslowStartTimeForTesting=60000\" -c 5 Native/csAckMirrorNoConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="CreateRegion with conflation setting yes" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]"> 
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion with conflation setting no" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion with conflation setting server" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation on" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting no" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting server" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="1" count="15" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys for durable client" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="15" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="update" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" timesToRun="350"  continueOnError="true" parallel="true" waitTime="60m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-      <data name="valueSizes">20</data>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="360">
-      <data name="sleepTime">300</data>
-    </task>
-    <!--task name="validate conflation with client conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task-->
-    <task name="validate conflation with client conflation off" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with client conflation as server" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-      <data name="isServerConflateTrue">false</data>
-    </task>
-    <!--task name="validate conflation with durable client conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task-->
-    <task name="validate conflation with durable client conflation off" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with durable client conflation as server" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-      <data name="isServerConflateTrue">false</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <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/Native/clientQConflationServerConflation.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/clientQConflationServerConflation.xml b/src/tests/cpp/xml/Generics/Native/clientQConflationServerConflation.xml
deleted file mode 100644
index ab4e1a0..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientQConflationServerConflation.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="conflate">true</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionDurable">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListenerDC"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="30" name="ThinClient"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientQConflationTest" description="Thin Client Q conflation test with server conflation setting enabled">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p \"-J-DslowStartTimeForTesting=170000\" -c 3 Native/csAckMirrorConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion with conflation setting yes" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion with conflation setting no" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion with conflation setting server" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation on" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting no" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting server" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-  <client-set begin="1" count="15" name="ThinClient"/>
-</task>
-    <task name="Register All Keys for durable client" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="15" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="update" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" timesToRun="350" waitTime="60m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-      <data name="valueSizes">20</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="550">
-      <client-set count="30" name="ThinClient"/>
-      <data name="sleepTime">300</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-      <data name="isServerConflateTrue">true</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-      <data name="isServerConflateTrue">true</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <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/Native/clientQConflationServerConflationFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/clientQConflationServerConflationFailover.xml b/src/tests/cpp/xml/Generics/Native/clientQConflationServerConflationFailover.xml
deleted file mode 100644
index 296909e..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientQConflationServerConflationFailover.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="conflate">true</data>
-  <data name="redundancyLevel">2</data>
-  <data name="minServers">4</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <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="keyType">int</data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-          <!--cache-listener library="perftests" function="createPerfTestCacheListener"/-->
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionDurable">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListenerDC"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="30" name="ThinClient"/>
-  <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="JCS6" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientQConflationTest" description="Thin Client Q conflation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p \"-J-DslowStartTimeForTesting=60000\" -c 6 Native/csAckMirrorConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="CreateRegion with conflation setting yes" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion with conflation setting no" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion with conflation setting server" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation on" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting no" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting server" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="1" count="15" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys for durable client" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="15" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="update" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" timesToRun="350"  continueOnError="true" parallel="true" waitTime="60m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-      <data name="valueSizes">20</data>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="stopStartCacheServer 6" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="360">
-      <data name="sleepTime">300</data>
-    </task>
-    <!--task name="validate conflation with client conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task-->
-    <task name="validate conflation with client conflation off" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <!--task name="validate conflation with client conflation as server" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-      <data name="isServerConflateTrue">true</data>
-    </task>
-    <task name="validate conflation with durable client conflation on" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task-->
-    <task name="validate conflation with durable client conflation off" action="doValidateQConflation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <!--task name="validate conflation with durable client conflation as server" action="doValidateQConflation" container="perftests" waitTime="5m">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-      <data name="isServerConflateTrue">true</data>
-    </task-->
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/clientScalabilityTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/clientScalabilityTest.xml b/src/tests/cpp/xml/Generics/Native/clientScalabilityTest.xml
deleted file mode 100644
index 69d4879..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientScalabilityTest.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="distinctKeysForDestroyTask">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JavaCacheServer" hostGroup="CS"/>
-  <client-set count="1024" name="ThinClient"/>
-
-
-  <test name="ClientScalabilityTest" description="ThinClientRegion client scalability tests">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native/csAckMirror.xml</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="2" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="1" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="3" count="2" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="3" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="5" count="12" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="5" count="12" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="17" count="16" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="17" count="16" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="33" count="32" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="33" count="32" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="65" count="64" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="65" count="64" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="129" count="128" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="129" count="128" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="257" count="256" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="257" count="256" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="513" count="512" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set begin="513" count="512" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </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="JavaCacheServer"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csAckMirror.xml b/src/tests/cpp/xml/Generics/Native/csAckMirror.xml
deleted file mode 100644
index 019868a..0000000
--- a/src/tests/cpp/xml/Generics/Native/csAckMirror.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csAckMirrorConflate.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csAckMirrorConflate.xml b/src/tests/cpp/xml/Generics/Native/csAckMirrorConflate.xml
deleted file mode 100644
index 0215767..0000000
--- a/src/tests/cpp/xml/Generics/Native/csAckMirrorConflate.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" message-time-to-live="3600" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" enable-subscription-conflation="true">
-      <cache-listener>
-         <class-name>javaobject.CacheListenerForConflation</class-name>
-       </cache-listener>
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csAckMirrorNoConflate.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csAckMirrorNoConflate.xml b/src/tests/cpp/xml/Generics/Native/csAckMirrorNoConflate.xml
deleted file mode 100644
index 02ecd4b..0000000
--- a/src/tests/cpp/xml/Generics/Native/csAckMirrorNoConflate.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" message-time-to-live="3600" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" >
-      <cache-listener>
-         <class-name>javaobject.CacheListenerForConflation</class-name>
-       </cache-listener>
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csAckMirrorQsize.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csAckMirrorQsize.xml b/src/tests/cpp/xml/Generics/Native/csAckMirrorQsize.xml
deleted file mode 100644
index 99da0ac..0000000
--- a/src/tests/cpp/xml/Generics/Native/csAckMirrorQsize.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csAckMirrorSecurity.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csAckMirrorSecurity.xml b/src/tests/cpp/xml/Generics/Native/csAckMirrorSecurity.xml
deleted file mode 100644
index 28a85de..0000000
--- a/src/tests/cpp/xml/Generics/Native/csAckMirrorSecurity.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csConflationNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csConflationNotifySubscription.xml b/src/tests/cpp/xml/Generics/Native/csConflationNotifySubscription.xml
deleted file mode 100644
index 772a781..0000000
--- a/src/tests/cpp/xml/Generics/Native/csConflationNotifySubscription.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" enable-subscription-conflation="true">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csHlru.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csHlru.xml b/src/tests/cpp/xml/Generics/Native/csHlru.xml
deleted file mode 100644
index 8549655..0000000
--- a/src/tests/cpp/xml/Generics/Native/csHlru.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="500" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csMirror.xml b/src/tests/cpp/xml/Generics/Native/csMirror.xml
deleted file mode 100644
index fdca041..0000000
--- a/src/tests/cpp/xml/Generics/Native/csMirror.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csMultiRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csMultiRegion.xml b/src/tests/cpp/xml/Generics/Native/csMultiRegion.xml
deleted file mode 100644
index 4d6ef85..0000000
--- a/src/tests/cpp/xml/Generics/Native/csMultiRegion.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<cache-server port="$PORT_NUM" />
-	
-	<region name="receiveValueTrue">
-		<region-attributes scope="distributed-ack" data-policy="replicate" />
-	</region>
-	
-	<region name="receiveValueFalse">
-		<region-attributes scope="distributed-ack" data-policy="replicate"/>
-	</region>
-	<region name="receiveValueNone">
-		<region-attributes scope="distributed-ack" data-policy="replicate"/>
-	</region>
-	
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csNoNotifyBySubscriptionServerCache.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csNoNotifyBySubscriptionServerCache.xml b/src/tests/cpp/xml/Generics/Native/csNoNotifyBySubscriptionServerCache.xml
deleted file mode 100644
index 7dcafd9..0000000
--- a/src/tests/cpp/xml/Generics/Native/csNoNotifyBySubscriptionServerCache.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<cache-server port="$PORT_NUM" />
-	
-	<region name="notifyBySubscriptionRegion">
-		<region-attributes scope="distributed-ack" data-policy="replicate" statistics-enabled="true" />
-	</region>
-	
-	<region name="noNotifyBySubscriptionRegion">
-		<region-attributes scope="distributed-ack" data-policy="replicate" statistics-enabled="true" />
-	</region>
-	
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csNotifyBySubscriptionServerCache.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csNotifyBySubscriptionServerCache.xml b/src/tests/cpp/xml/Generics/Native/csNotifyBySubscriptionServerCache.xml
deleted file mode 100644
index 7dcafd9..0000000
--- a/src/tests/cpp/xml/Generics/Native/csNotifyBySubscriptionServerCache.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<cache-server port="$PORT_NUM" />
-	
-	<region name="notifyBySubscriptionRegion">
-		<region-attributes scope="distributed-ack" data-policy="replicate" statistics-enabled="true" />
-	</region>
-	
-	<region name="noNotifyBySubscriptionRegion">
-		<region-attributes scope="distributed-ack" data-policy="replicate" statistics-enabled="true" />
-	</region>
-	
-</cache>

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csServerEviction.xml b/src/tests/cpp/xml/Generics/Native/csServerEviction.xml
deleted file mode 100644
index 8eabf2d..0000000
--- a/src/tests/cpp/xml/Generics/Native/csServerEviction.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack">
-      <eviction-attributes>
-        <lru-heap-percentage maximum="70" time-interval="100"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/csServerOverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/csServerOverflowToDisk.xml b/src/tests/cpp/xml/Generics/Native/csServerOverflowToDisk.xml
deleted file mode 100644
index f271470..0000000
--- a/src/tests/cpp/xml/Generics/Native/csServerOverflowToDisk.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" persist-backup="true">
-      <eviction-attributes>
-        <lru-heap-percentage maximum="70" time-interval="100" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 


[38/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedRegion.xml b/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedRegion.xml
deleted file mode 100644
index 9dbd07b..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedRegion.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="replicate">
-    </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/exceptionHandling.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/exceptionHandling.xml b/src/tests/cpp/xml/Generics/FunctionExecution/exceptionHandling.xml
deleted file mode 100644
index ed7802e..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/exceptionHandling.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-  	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">2</data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="partitionedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion2">
-    <snippet>
-      <region name="replicatedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="exceptionHandling" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedPR.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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion2</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">partitionedRegion</data>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">replicatedRegion</data>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteExceptionHandling" action="doExecuteExceptionHandling" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="20m" continueOnError="true" parallel="true" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>ParitionedRegionFunctionExecution</item>
-          <item>ReplicatedRegionFunctionExecution</item>
-          <item>FireAndForgetFunctionExecution</item>
-          <item>OnServersFunctionExcecution</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/FunctionExecution/functionExecutionHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/functionExecutionHA.xml b/src/tests/cpp/xml/Generics/FunctionExecution/functionExecutionHA.xml
deleted file mode 100644
index c610db1..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/functionExecutionHA.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="partitionedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion2">
-    <snippet>
-      <region name="replicatedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="functionExecutionHA" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedPR.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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion2</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">partitionedRegion</data>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">replicatedRegion</data>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunctionWithHA" action="doExecuteExceptionHandling" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="20m" continueOnError="true" parallel="true" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>ParitionedRegionFunctionExecution</item>
-          <item>ReplicatedRegionFunctionExecution</item>
-          <item>FireAndForgetFunctionExecution</item>
-          <item>OnServersFunctionExcecution</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/FunctionExecution/onRegionFunctionExecHAWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecHAWithResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecHAWithResult.xml
deleted file mode 100644
index b168517..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecHAWithResult.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>30000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <client-set name="Feeder"/>
-  <data name="minServers">2</data>
-  <data name="getResult">true</data>
-  <data name="isResultCollector">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegionForFEHA.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="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctionsHA" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" parallel="true" waitTime="25m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="1" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="1" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="1" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/FunctionExecution/onRegionFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithOutResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithOutResult.xml
deleted file mode 100644
index 1af96f4..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithOutResult.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">false</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithOutResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/FunctionExecution/onRegionFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithResult.xml
deleted file mode 100644
index 6d5e81b..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithResult.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/FunctionExecution/onServerFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithOutResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithOutResult.xml
deleted file mode 100644
index 0081b02..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithOutResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">false</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServer</data>
-	
-  <test name="onServerFunctionExecWithOutResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>get</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/FunctionExecution/onServerFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithResult.xml
deleted file mode 100644
index cf0ee91..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServer</data>
-	
-  <test name="onServerFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>get</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/FunctionExecution/onServersFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithOutResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithOutResult.xml
deleted file mode 100644
index 0aced30..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithOutResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">false</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServers</data>
-	
-  <test name="onServersFunctionExecWithOutResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/FunctionExecution/onServersFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithResult.xml
deleted file mode 100644
index e59892b..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServers</data>
-	
-  <test name="onServersFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/FunctionExecution/replicatedRegionExecution.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/replicatedRegionExecution.xml b/src/tests/cpp/xml/Generics/FunctionExecution/replicatedRegionExecution.xml
deleted file mode 100644
index 9310933..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/replicatedRegionExecution.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="replicated">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="replicatedRegionExecution" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedRegion.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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/Native/CyberTraderInterestListUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/CyberTraderInterestListUpdateTest.xml b/src/tests/cpp/xml/Generics/Native/CyberTraderInterestListUpdateTest.xml
deleted file mode 100644
index 8faebf8..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderInterestListUpdateTest.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1848</item>
-    </list>
-  </data>
-  <data name="expectedCount">1848</data>
-
-  <data name="valueSizes">
-    <list>
-      <item>3000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Gets Entries in Subscriber" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableIntTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableIntTest2.xml b/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableIntTest2.xml
deleted file mode 100644
index b5ccd53..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableIntTest2.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>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">int</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="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client Perf test with puts and gets for keyType int">
-    <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="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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-
-    <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>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest.xml b/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest.xml
deleted file mode 100644
index 3e95afb..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>
-
-  <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 with puts for mixed keyType">
-    <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keyType">int</data>
-    </task>
-    <task name="LocalDestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-<task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-
-    <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/Native/CyberTraderPerfVariableTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest2.xml b/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest2.xml
deleted file mode 100644
index c426df7..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest2.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>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>
-
-  <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 with puts and gets for keyType string">
-    <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size with 3rd cache member" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-
-    <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/Native/CyberTraderPerfVariableTestIntWithHLRU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestIntWithHLRU.xml b/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestIntWithHLRU.xml
deleted file mode 100644
index be15503..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestIntWithHLRU.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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">int</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="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test with HLRU for keyType int">
-    <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="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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-
-    <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>
-  </test>
-
-</test-driver>


[23/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyList.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyList.xml b/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyList.xml
deleted file mode 100644
index 2912c13..0000000
--- a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyList.xml
+++ /dev/null
@@ -1,132 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyList" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/subscription/csPRegion.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOpsRI" action="doVerifyRegionContentsAfterOpsRI" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/parReg/subscription/staticInterestPolicyListLateOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyListLateOps.xml b/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyListLateOps.xml
deleted file mode 100644
index 3efa31b..0000000
--- a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyListLateOps.xml
+++ /dev/null
@@ -1,138 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyListLateOps" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/subscription/csPRegion.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="Register Key List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsBeforeOps" action="doVerifyRegionContentsBeforeOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-      <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/parReg/subscription/staticInterestPolicySingle.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicySingle.xml b/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicySingle.xml
deleted file mode 100644
index 7331208..0000000
--- a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicySingle.xml
+++ /dev/null
@@ -1,126 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">5000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicySingle" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with single KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/subscription/csPRegion.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register Single keys and verify" action="doRegisterSingleKey" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/parReg/subscription/staticInterestPolicySingleLateOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicySingleLateOps.xml b/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicySingleLateOps.xml
deleted file mode 100644
index 4258aea..0000000
--- a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicySingleLateOps.xml
+++ /dev/null
@@ -1,138 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="expectedRegionContents">static_RI_noops_keysValues</data>
-  <data name="entryCount">5000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicySingleLateOps" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with single keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/subscription/csPRegion.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="Register singel Keys" action="doRegisterSingleKey" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsBeforeOps" action="doVerifyRegionContentsBeforeOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m">
-       <client-set count="10" name="Client"/>
-    </task>
-      <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/parReg/tx/colocatedTxBridge.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/colocatedTxBridge.xml b/src/tests/cpp/xml/Generics/parReg/tx/colocatedTxBridge.xml
deleted file mode 100644
index 49f34b2..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/colocatedTxBridge.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">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
-  <data name="NumberOfRegion">5</data>
- 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" locators="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientEmptyRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <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 count="4" name="Client"/>
-
-  <test name="colocatedTxBridge" description="edgeClients execute transactions on servers hosting PRs (using the same key across multiple co-located regions)">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Generics/parReg/tx/csPartitionRegionColo.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientEmptyRegion</data>
-    </task>
-     <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Population Entries" action="doPopulateNewEntry" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="String,String">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>update</item>
-          <item>get</item>
-         </oneof>
-      </data>
-      <data name="workTime">100</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="1" count="1"" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-    <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="2" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/tx/conParRegBridge.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridge.xml b/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridge.xml
deleted file mode 100644
index 76000c4..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridge.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
- 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <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 count="4" name="Client"/>
-
-  <test name="conParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all bridge servers">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/tx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="1" count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-          <item>putAll</item>          
-         </oneof>
-      </data>
-      <data name="workTime">100</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-    <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="1" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/tx/conParRegBridge1.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridge1.xml b/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridge1.xml
deleted file mode 100644
index 0861fe8..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridge1.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
- 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <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 count="4" name="Client"/>
-
-  <test name="conParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all bridge servers">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/tx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-     <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-          <item>putAll</item>          
-         </oneof>
-      </data>
-      <data name="workTime">100</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-    <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="1" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/tx/conParRegBridge2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridge2.xml b/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridge2.xml
deleted file mode 100644
index add88d5..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridge2.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
- 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <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 count="4" name="Client"/>
-
-  <test name="conParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all bridge servers">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/tx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-     <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-          <item>putAll</item>          
-         </oneof>
-      </data>
-      <data name="workTime">100</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-    <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="1" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/tx/conParRegBridgeRRRedundency2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRRRedundency2.xml b/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRRRedundency2.xml
deleted file mode 100644
index 8ec9d7c..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRRRedundency2.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
- 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="2" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="minServers">2</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="JCS6" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-
-  <test name="conParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all bridge servers">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 Generics/parReg/tx/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="StartCacheServers" 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="StartCacheServers" 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="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="1" count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-          <item>putAll</item>          
-         </oneof>
-      </data>
-      <data name="workTime">200</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-     <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-    <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="1" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    
-    
-
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency1.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency1.xml b/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency1.xml
deleted file mode 100644
index 2f35fc1..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency1.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
- 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="1" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="minServers">1</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 count="4" name="Client"/>
-
-  <test name="conParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all bridge servers">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 Generics/parReg/tx/csPRRedundency1.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="StartCacheServers" 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="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="1" count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-          <item>putAll</item>          
-         </oneof>
-      </data>
-      <data name="workTime">200</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-   <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-    <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="1" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" 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/parReg/tx/conParRegBridgeRedundency2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency2.xml b/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency2.xml
deleted file mode 100644
index 535d086..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency2.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
- 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="2" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="minServers">2</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="JCS6" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-
-  <test name="conParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all bridge servers">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 Generics/parReg/tx/csPRRedundency2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="StartCacheServers" 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="StartCacheServers" 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="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="1" count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-          <item>putAll</item>          
-         </oneof>
-      </data>
-      <data name="workTime">200</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-     <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-    <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="1" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    
-    
-
-  </test>
-
-</test-driver>


[10/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/failoverTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/failoverTest.xml b/src/tests/cpp/xml/MixedModeCS/failoverTest.xml
deleted file mode 100644
index 697e378..0000000
--- a/src/tests/cpp/xml/MixedModeCS/failoverTest.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="CSDriver" hostGroup="CSD"/>
-  <client-set count="6" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="YAPerfTest" description="Thin Client perf test">
-    <task name="setupCacheServers" 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="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="StartCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startCSFwk</data>
-      <data name="arguments">--xml=MixedModeCS/failoverTest_CS.xml</data>
-      <data name="background">true</data>
-      <client-set name="CSDriver"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="6" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="6" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate true</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="3" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="4" count="3" name="ThinClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="3" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="WaitForCSharp" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneCSharp 1200</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="StopCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopCSFwk</data>
-      <data name="arguments"></data>
-      <client-set name="CSDriver"/>
-    </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/MixedModeCS/failoverTest_CS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/failoverTest_CS.xml b/src/tests/cpp/xml/MixedModeCS/failoverTest_CS.xml
deleted file mode 100644
index cd35205..0000000
--- a/src/tests/cpp/xml/MixedModeCS/failoverTest_CS.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set count="6" name="ThinClient"/>
-
-  <test name="YAPerfTest" description="Thin Client perf test">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">CPP</data>
-      <client-set count="1" name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="6" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="6" name="ThinClient"/>
-    </task>
-    <task name="WaitForPopulate" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate 1200</data>
-      <client-set count="1" name="ThinClient"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="3" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="4" count="3" name="ThinClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="DoneCSharp" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneCSharp true</data>
-      <client-set count="1" name="ThinClient"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/interopDataValidation.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/interopDataValidation.xml b/src/tests/cpp/xml/MixedModeCS/interopDataValidation.xml
deleted file mode 100644
index 3cf0e9f..0000000
--- a/src/tests/cpp/xml/MixedModeCS/interopDataValidation.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="regionName">TestTCR1</data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="CSDriver" hostGroup="CSD"/>
-  <client-set name="native"/>
-
-  <test name="DataValidationTest" description="This test would authenticate that the data seen by C# and native clients are same">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 1 Native/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-
-    <task name="StartCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startCSFwk</data>
-      <data name="arguments">--xml=MixedModeCS/interopDataValidation_CS.xml</data>
-      <data name="background">true</data>
-      <client-set name="CSDriver"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="native"/>
-    </task>
-
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="native"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRangePositions" container="querytests" waitTime="15m">
-      <data name="range-start">0</data>
-      <data name="range-end">100</data>
-      <client-set name="native"/>
-    </task>
-
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate true</data>
-      <client-set name="native"/>
-    </task>
-
-    <task name="WaitForCSharpDonePopulate" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulateCS 1200</data>
-      <client-set name="native"/>
-    </task>
-
-    <task name="ValidateData" action="doGetAndComparePositionObjects" container="querytests" waitTime="30m">
-      <data name="range-start">101</data>
-      <data name="range-end">200</data>
-      <client-set name="native"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m">
-      <client-set name="native"/>
-    </task>
-
-    <task name="WaitForCSharp" action="doRunProcess" container="utils" waitTime="20m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneCSharp 1200</data>
-      <client-set name="native"/>
-    </task>
-
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/interopDataValidation_CS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/interopDataValidation_CS.xml b/src/tests/cpp/xml/MixedModeCS/interopDataValidation_CS.xml
deleted file mode 100644
index 55f52e5..0000000
--- a/src/tests/cpp/xml/MixedModeCS/interopDataValidation_CS.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="regionName">TestTCR1</data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="csharpnative"/>
-
-  <test name="DataValiadtionTest" description="This test would authenticate that the data seen by C# and native clients are same">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">CPP</data>
-      <client-set name="csharpnative"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="csharpnative"/>
-    </task>
-
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="csharpnative"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRangePositions" container="querytests" waitTime="15m">
-      <data name="range-start">101</data>
-      <data name="range-end">200</data>
-      <client-set name="csharpnative"/>
-    </task>
-
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulateCS true</data>
-      <client-set name="csharpnative"/>
-    </task>
-
-    <task name="WaitForPopulate" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate 1200</data>
-      <client-set name="csharpnative"/>
-    </task>
-
-    <task name="ValidateData" action="doGetAndComparePositionObjects" container="querytests" waitTime="30m">
-      <data name="range-start">0</data>
-      <data name="range-end">100</data>
-      <client-set name="csharpnative"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-
-    <task name="DoneCSharp" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneCSharp true</data>
-      <client-set name="csharpnative"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/interopWithFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/interopWithFailover.xml b/src/tests/cpp/xml/MixedModeCS/interopWithFailover.xml
deleted file mode 100644
index fff5e46..0000000
--- a/src/tests/cpp/xml/MixedModeCS/interopWithFailover.xml
+++ /dev/null
@@ -1,169 +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="regionName">TestTCR1</data>
-
-  <data name="sleepTime">
-    <oneof>
-      <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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="C++Feeder"/>
-  <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="CSDriver" hostGroup="CSD"/>
-  <client-set count="10" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Native/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <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" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-
-    <task name="StartCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startCSFwk</data>
-      <data name="arguments">--xml=MixedModeCS/interopWithFailover_CS.xml</data>
-      <data name="background">true</data>
-      <client-set name="CSDriver"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="C++Feeder"/>
-    </task>
-
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-      <client-set name="C++Feeder"/>
-    </task>
-
-    <task name="FeedC++" action="doPopulateRangePositions" container="querytests" waitTime="5m">
-      <data name="range-start">0</data>
-      <data name="range-end">500</data>
-      <client-set name="C++Feeder"/>
-    </task>
-
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate true</data>
-      <client-set name="C++Feeder"/>
-    </task>
-
-    <task name="WaitForCSharpDonePopulate" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulateCS 1200</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="Client Events" action="doUpdateRangePositions" container="queryTests" waitTime="2h10m" parallel="true">
-      <data name="workTime">30m</data>
-      <data name="range-max">1000</data>
-      <client-set name="C++Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="3h30m" 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="3h30m" 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="3h30m" 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="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-
-    <task name="Client Events" action="doVerifyAllPositionObjects" container="queryTests" waitTime="2h10m">
-      <data name="range-max">1000</data>
-      <client-set name="C++Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="querytests" waitTime="2m"/>
-    
-    <task name="WaitForCSharp" action="doRunProcess" container="utils" waitTime="20m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneCSharp 1200</data>
-      <client-set name="C++Feeder"/>
-    </task>
-
-    <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/MixedModeCS/interopWithFailover_CS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/interopWithFailover_CS.xml b/src/tests/cpp/xml/MixedModeCS/interopWithFailover_CS.xml
deleted file mode 100644
index a303f91..0000000
--- a/src/tests/cpp/xml/MixedModeCS/interopWithFailover_CS.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="regionName">TestTCR1</data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="csharpFeeder"/>
-  <client-set count="4" name="csharpnative"/>
-
-  <test name="DataValiadtionTest" description="This test would authenticate that the data seen by C# and native clients are same even with failover">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">CPP</data>
-      <client-set name="csharpFeeder"/>
-      <client-set count="4" name="csharpnative"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="queryTests" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="csharpFeeder"/>
-      <client-set count="4" name="csharpnative"/>
-    </task>
-
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="csharpFeeder"/>
-      <client-set count="4" name="csharpnative"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRangePositions" container="querytests" waitTime="15m">
-      <data name="range-start">501</data>
-      <data name="range-end">1000</data>
-      <client-set name="csharpFeeder"/>
-    </task>
-
-    <task name="DonePopulateCS" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulateCS true</data>
-      <client-set name="csharpFeeder"/>
-    </task>
-
-    <task name="WaitForPopulate" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate 1200</data>
-      <client-set name="csharpFeeder"/>
-    </task>
-
-    <task name="Client Events" action="doUpdateRangePositions" container="queryTests" waitTime="2h10m">
-      <data name="workTime">30m</data>
-      <data name="range-max">1000</data>
-      <client-set name="C++Feeder"/>
-      <client-set count="4" name="csharpnative"/>
-    </task>
-
-    <task name="Client Events" action="doVerifyAllPositionObjects" container="queryTests" waitTime="2h10m"> 
-      <data name="range-max">1000</data>
-      <client-set name="csharpFeeder"/>
-      <client-set count="4" name="csharpnative"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-
-    <task name="DoneCSharp" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneCSharp true</data>
-      <client-set name="csharpFeeder"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/throughPuts32K.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/throughPuts32K.xml b/src/tests/cpp/xml/MixedModeCS/throughPuts32K.xml
deleted file mode 100644
index fd3321d..0000000
--- a/src/tests/cpp/xml/MixedModeCS/throughPuts32K.xml
+++ /dev/null
@@ -1,339 +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="burstMillis">300</data>
-  <data name="burstPause">6</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">int</data>
-  <data name="opsSecond">100</data>
-  <data name="interestPercent">10</data>
-  <data name="cacheType">CLIENT</data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>4</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="CSDriver" hostGroup="CSD"/>
-  <client-set name="Feeder"/>
-  <client-set count="48" name="Client"/>
-
-  <!-- This test was created for the 100 Node Test, 1 Feed, 3 Servers, and up to 96 Clients -->
-
-  <test name="32 clients per server 32k values" description="Feed throughput testing">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 csAckMirror.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="StartCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startCSFwk</data>
-      <data name="arguments">--xml=MixedModeCS/throughPuts32K_CS.xml</data>
-      <data name="background">true</data>
-      <client-set name="CSDriver"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="valueSizes"><list><item>32768</item></list></data>
-    </task>
-
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <task name="WaitForCSClients" action="doRunProcess" container="utils" waitTime="1h">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopClient 3000</data>
-      <client-set name="Feeder"/>
-    </task>
-
-  <!-- Throughput measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <data name="opsSecond">50</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="valueSizes"><list><item>32768</item></list></data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="DoneDestroy" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneDestroy true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-
-  <!--test with 24 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="valueSizes"><list><item>32768</item></list></data>
-    </task>
-
-    <task name="DonePopulate2" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate2 true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="36" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="36" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="clientCount">36</data>
-      <client-set count="36" name="Client"/>
-    </task>
-
-    <task name="WaitForCSClients2" action="doRunProcess" container="utils" waitTime="1h">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopClient2 3000</data>
-      <client-set name="Feeder"/>
-    </task>
-
-  <!-- Throughput measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <data name="opsSecond">50</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="valueSizes"><list><item>32768</item></list></data>
-      <data name="clientCount">36</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="DoneDestroy2" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneDestroy2 true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="36" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-
-  <!--test with 16 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="valueSizes"><list><item>32768</item></list></data>
-    </task>
-
-    <task name="DonePopulate3" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate3 true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <task name="WaitForCSClients3" action="doRunProcess" container="utils" waitTime="1h">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopClient3 3000</data>
-      <client-set name="Feeder"/>
-    </task>
-
-  <!-- Throughput measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <data name="opsSecond">50</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="valueSizes"><list><item>32768</item></list></data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="DoneDestroy3" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneDestroy3 true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-
-  <!--test with 8 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="valueSizes"><list><item>32768</item></list></data>
-    </task>
-
-    <task name="DonePopulate4" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate4 true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="12" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="12" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="clientCount">12</data>
-      <client-set count="12" name="Client"/>
-    </task>
-
-    <task name="WaitForCSClients4" action="doRunProcess" container="utils" waitTime="1h">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopClient4 3000</data>
-      <client-set name="Feeder"/>
-    </task>
-
-  <!-- Throughput measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Throughput" action="doPutBursts" container="perftests" waitTime="1h">
-      <data name="opsSecond">50</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="valueSizes"><list><item>32768</item></list></data>
-      <data name="clientCount">12</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="DoneDestroy4" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneDestroy4 true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="12" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="WaitForCSharp" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneCSharp 1200</data>
-      <client-set name="JCS1"/>
-    </task>
-    <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>
-    <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="JCS3"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/throughPuts32K_CS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/throughPuts32K_CS.xml b/src/tests/cpp/xml/MixedModeCS/throughPuts32K_CS.xml
deleted file mode 100644
index b494968..0000000
--- a/src/tests/cpp/xml/MixedModeCS/throughPuts32K_CS.xml
+++ /dev/null
@@ -1,195 +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="burstMillis">300</data>
-  <data name="burstPause">6</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">int</data>
-  <data name="opsSecond">100</data>
-  <data name="interestPercent">10</data>
-  <data name="cacheType">CLIENT</data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>4</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="48" name="Client"/>
-
-  <!-- This test was created for the 100 Node Test, 1 Feed, 3 Servers, and up to 96 Clients -->
-
-  <test name="32 clients per server 32k values" description="Feed throughput testing">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">CPP</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <task name="WaitForPopulate" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <task name="DonePopClient" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopClient true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-  <!-- Throughput measurement with 3 servers, 32 clients per server -->
-    <task name="WaitForDestroy" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneDestroy 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-
-  <!--test with 24 clients per server and 32k values-->
-    <task name="WaitForPopulate2" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate2 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="36" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="36" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="clientCount">36</data>
-      <client-set count="36" name="Client"/>
-    </task>
-
-    <task name="DonePopClient2" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopClient2 true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-  <!-- Throughput measurement with 3 servers, 24 clients per server -->
-    <task name="WaitForDestroy2" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneDestroy2 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="36" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-
-  <!--test with 16 clients per server and 32k values-->
-    <task name="WaitForPopulate3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate3 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <task name="DonePopClient3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopClient3 true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-  <!-- Throughput measurement with 3 servers, 16 clients per server -->
-    <task name="WaitForDestroy3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneDestroy3 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-
-  <!--test with 8 clients per server and 32k values-->
-    <task name="WaitForPopulate4" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate4 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="12" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="12" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="distinctKeys"><list><item>16384</item></list></data>
-      <data name="clientCount">12</data>
-      <client-set count="12" name="Client"/>
-    </task>
-
-    <task name="DonePopClient4" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopClient4 true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-  <!-- Throughput measurement with 3 servers, 8 clients per server -->
-    <task name="WaitForDestroy4" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneDestroy4 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="12" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="DoneCSharp" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneCSharp true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/CyberTraderInterestListUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/CyberTraderInterestListUpdateTest.xml b/src/tests/cpp/xml/Native/CyberTraderInterestListUpdateTest.xml
deleted file mode 100644
index 80cb0ce..0000000
--- a/src/tests/cpp/xml/Native/CyberTraderInterestListUpdateTest.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1848</item>
-    </list>
-  </data>
-  <data name="expectedCount">1848</data>
-
-  <data name="valueSizes">
-    <list>
-      <item>3000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Gets Entries in Subscriber" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest.xml b/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest.xml
deleted file mode 100644
index 93fd190..0000000
--- a/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>
-
-  <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="perftests" 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/Native/CyberTraderPerfVariableTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest2.xml b/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest2.xml
deleted file mode 100644
index bebf740..0000000
--- a/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest2.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>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>
-
-  <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="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" 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="15m">
-      <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/Native/CyberTraderPerfVariableTestWithHLRU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/CyberTraderPerfVariableTestWithHLRU.xml b/src/tests/cpp/xml/Native/CyberTraderPerfVariableTestWithHLRU.xml
deleted file mode 100644
index a000ae9..0000000
--- a/src/tests/cpp/xml/Native/CyberTraderPerfVariableTestWithHLRU.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">
-
-  <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>
-
-  <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="StartCacheServers CS3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-    <task name="StopCacheServers CS3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" 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/Native/clientEvents.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientEvents.xml b/src/tests/cpp/xml/Native/clientEvents.xml
deleted file mode 100644
index 650c28d..0000000
--- a/src/tests/cpp/xml/Native/clientEvents.xml
+++ /dev/null
@@ -1,107 +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="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" 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="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="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="2h10m">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/clientEventsFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/clientEventsFailover.xml b/src/tests/cpp/xml/Native/clientEventsFailover.xml
deleted file mode 100644
index e92edf6..0000000
--- a/src/tests/cpp/xml/Native/clientEventsFailover.xml
+++ /dev/null
@@ -1,163 +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="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-   
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Native/csAckMirror.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="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="20" name="Client"/>
-    </task>    
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="30m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-           <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>


[41/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Delta/csDeltaPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Delta/csDeltaPR.xml b/src/tests/cpp/xml/Generics/Delta/csDeltaPR.xml
deleted file mode 100644
index 3bb35c1..0000000
--- a/src/tests/cpp/xml/Generics/Delta/csDeltaPR.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-	<!--cache-server host="cod" port="24680" /-->
-	<cache-server port="$PORT_NUM"/>
-
-	<region name="dummy">
-		<region-attributes data-policy="partition" cloning-enabled="true" >
-		  <partition-attributes redundant-copies="1"/>
-		</region-attributes>
-		<entry>
-              <key><string>delta1-1</string></key>
-                <value>
-                  <declarable>
-                    <class-name>javaobject.DeltaTestImpl</class-name>
-                  </declarable>
-                </value>
-         </entry>
-	</region>
-	<region name="TestTCR1">
-		<region-attributes data-policy="partition" cloning-enabled="true" >
-		  <partition-attributes redundant-copies="1"/>
-		  </region-attributes>
-		  </region>
-</cache> 

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

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

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/DurableClient/csAckMirror.xml b/src/tests/cpp/xml/Generics/DurableClient/csAckMirror.xml
deleted file mode 100644
index 019868a..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/csAckMirror.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/DurableClient/durableFailoverR2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/DurableClient/durableFailoverR2.xml b/src/tests/cpp/xml/Generics/DurableClient/durableFailoverR2.xml
deleted file mode 100644
index 9f3b225..0000000
--- a/src/tests/cpp/xml/Generics/DurableClient/durableFailoverR2.xml
+++ /dev/null
@@ -1,257 +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="timedInterval">5m</data>
-  <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">120</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/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" 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"/>
-    </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"/>
-    </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>


[49/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33198.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33198.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33198.xml
deleted file mode 100755
index f8aa565..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33198.xml
+++ /dev/null
@@ -1,277 +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="keySize">
-		<range low="4" high="12"/>
-	</data>
-	<data name="distinctKeys">
-		10000
-	</data>
-	<data name="valueSizes">
-		<range low="0" high="85607"/>
-	</data>
-	<data name="numThreads">
-		<list>
-			<item>1</item>
-			<item>2</item>
-			<item>3</item>
-			<item>4</item>
-			<item>7</item>
-			<item>10</item>
-		</list>
-	</data>
-	<data name="entryOps">
-		<oneof>
-			<item>add</item>
-			<item>add</item>
-			<item>update</item>
-			<item>invalidate</item>
-			<item>read</item>
-			<item>destroy</item>
-			<item>localInvalidate</item>
-			<item>localDestroy</item>
-			<!-- item>abort</item>  seg v -->
-			<!-- <item>exit</item>	 exit(0) -->
-			<item>done</item>	<!--  leave doOperation, exit while loop -->
-		</oneof>
-	</data>
-	<data name="opCount">
-		<range low="1" high="10"/>
-	</data>
-	<data name="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">300</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="skipCount">1000</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set>
-		<data name="regionName">???</data>
-		<data name="scope">???</data>
-		<data name="mirroring">???</data>
-		<data name="loadFactor">???</data>
-		<data name="statisticsEnabled">???</data>
-		<data name="concurrencyLevel">???</data>
-		<data name="interestListEnabled">???</data>
-		<data name="initialCapacity">???</data>
-		<data name="entryTTLSec">???</data>
-		<data name="entryTTLAction">???</data>
-		<data name="entryIdleTimeoutSec">???</data>
-		<data name="entryIdleTimeoutAction">???</data>
-		<data name="lruEntriesLimit">???</data>
-		<data name="cachingEnabled">???</data>
-		<data name="valueDistLimit">???</data>
-	</data-set>
-	<data-set name="Local">
-		<data name="regionName">Local</data>
-		<data name="scope">local</data>
-	</data-set>
-	<data-set name="AckMirrorNil">
-		<data name="regionName">AckMirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackMirrorNil">
-		<data name="regionName">NackMirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackNmirrorNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckMirrorIl">
-		<data name="regionName">AckMirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackMirrorIl">
-		<data name="regionName">NackMirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="AckNmirrorIl">
-		<data name="regionName">AckNmirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackNmirrorIl">
-		<data name="regionName">NackNmirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackNmirrorNcacheNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-		<data name="cachingEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNcacheNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-		<data name="cachingEnabled">false</data>
-	</data-set>
-	
-	<client-set name="NonDriver">
-		<client name="ClientB"/>
-		<client name="ClientC"/>
-		<client name="ClientD"/>
-		<client name="ClientE"/>
-	</client-set>
-	
-	<client-set name="Driver">
-		<client name="ClientA"/>
-	</client-set>
-	
-	<data name="taskResult">
-		<oneof>
-			<item>pass</item>
-			<item>pass</item>
-			<item>pass</item>
-			<item>fail</item>
-		</oneof>
-	</data>
-	
-	<test name="Local" description="Local Entry Event test" waitTime="780">
-		<task name="CreateReg-LocalA" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">Local</data>
-		</task>
-		<!--task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/-->
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Entry Event test" waitTime="3000">
-		<task name="CreateRegion-AckMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackMirrorNil" description="NackMirrorNil Entry Event test" waitTime="3000">
-		<task name="CreateRegion-NackMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="AckNmirrorNil" description="AckNmirrorNil Entry Event test" waitTime="3000">
-		<task name="CreateRegion-AckNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackNmirrorNil" description="NackNmirrorNil Entry Event test" waitTime="3000">
-		<task name="CreateRegion-NackNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="AckMirrorIl" description="AckMirrorIl Entry Event test" waitTime="3000">
-		<task name="CreateRegion-AckMirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackMirrorIl" description="NackMirrorIl Entry Event test" waitTime="3000">
-		<task name="CreateRegion-NackMirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="AckNmirrorIl" description="AckNmirrorIl Entry Event test" waitTime="3000">
-		<task name="CreateRegion-AckNmirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackNmirrorIl" description="NackNmirrorIl Entry Event test" waitTime="3000">
-		<task name="CreateRegion-NackNmirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="AckNmirrorNcacheNil" description="AckNmirrorNcacheNil Entry Event test" waitTime="3000">
-		<task name="CreateRegion-AckNmirrorNcacheNil" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackNmirrorNcacheNil" description="NackNmirrorNcacheNil Entry Event test" waitTime="3000">
-		<task name="CreateRegion-NackNmirrorNcacheNil" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="MixedNil" description="MixedNil Entry Event test" waitTime="3000">
-		<task name="CreateRegion-MixedNil" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNmirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>AckMirrorNil</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="MixedIl" description="MixedIl Entry Event test" waitTime="3000">
-		<task name="CreateRegion-MixedIl" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">MixedIl</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNmirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>AckMirrorIl</item>
-				</oneof>
-			</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="60" timesToRun="45" continueOnError="false"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33242.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33242.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33242.xml
deleted file mode 100755
index 47f83c4..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33242.xml
+++ /dev/null
@@ -1,370 +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="maxTestTime">10200</data>
-	<data name="minTaskGranularitySec">300</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-
-	<data-set name="Local">
-		<data name="regionName">Local</data>
-		<data name="scope">local</data>
-	</data-set>
-	<data-set name="AckMirrorNil">
-		<data name="regionName">AckMirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackMirrorNil">
-		<data name="regionName">NackMirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackNmirrorNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckMirrorIl">
-		<data name="regionName">AckMirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackMirrorIl">
-		<data name="regionName">NackMirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="AckNmirrorIl">
-		<data name="regionName">AckNmirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackNmirrorIl">
-		<data name="regionName">NackNmirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackNmirrorNcacheNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-		<data name="cachingEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNcacheNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-		<data name="cachingEnabled">false</data>
-	</data-set>
-	
-	<client-set>
-    <client name="A"></client>
-    <client name="B"></client>
-    <client name="C"></client>
-  </client-set>
-	<test name="Local" description="Local Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-      <client-set>
-        <client name="A"></client>
-        <client name="C"></client>
-      </client-set>
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Entry Event test" waitTime="780">
-    <task name="sleepA" action="doSleep" container="eventtest" waitTime="60" continueOnError="false" parallel="false">
-      <client-set>
-        <client name="A"></client>
-      </client-set>
-      <data name="sleepTime">10</data>
-    </task>
-    <task name="sleepB" action="doSleep" container="eventtest" waitTime="60" continueOnError="false" parallel="true">
-      <client-set>
-        <client name="B"></client>
-      </client-set>
-      <data name="sleepTime">10</data>
-    </task>
-    <task name="sleepC" action="doSleep" container="eventtest" waitTime="60" continueOnError="false" parallel="true">
-      <client-set>
-        <client name="C"></client>
-      </client-set>
-      <data name="sleepTime">10</data>
-    </task>
-    <task name="sleepD" action="doSleep" container="eventtest" waitTime="60" continueOnError="false">
-      <data name="sleepTime">10</data>
-    </task>
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="NackMirrorNil" description="NackMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="AckNmirrorNil" description="AckNmirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorNil" description="NackNmirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="AckMirrorIl" description="AckMirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="NackMirrorIl" description="NackMirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="AckNmirrorIl" description="AckNmirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorIl" description="NackNmirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="AckNmirrorNcacheNil" description="AckNmirrorNcacheNil Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorNcacheNil" description="NackNmirrorNcacheNil Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="MixedNil" description="MixedNil Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="MixedIl" description="MixedIl Entry Event test" waitTime="780">
-		<task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">
-				<oneof>
-					<item>Local</item>
-					<item>AckMirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>NackNmirrorNil</item>
-					<item>AckMirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>NackNmirrorIl</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33502.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33502.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33502.xml
deleted file mode 100755
index 1656f04..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33502.xml
+++ /dev/null
@@ -1,52 +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="systemName">CSTest</data>
-  <data name="cacheType">PEER</data>
-  <data name="scope">NACK</data>
-
-  <client-set name="All">
-    <client name="ClientF1"></client>
-  </client-set>
-	
-  <test name="ValidateCounts" description="Count distributed events">
-
-    <task name="CreateFeed" action="createCountingProcess" container="libcacheserver" waitTime="60" parallel="true">
-      <data name="cacheType">PEER</data>
-      <data name="regionName">CSRegion</data>
-      <client-set>
-        <client name="ClientF1"></client>
-      </client-set>
-    </task>
-		
-    <task name="CreateServers" action="createCountingProcess" container="libcacheserver" waitTime="60" parallel="true">
-      <data name="cacheType">SERVER</data>
-      <data name="regionName">CSRegion</data>
-      <client-set exclude="true">
-        <client name="ClientF1"></client>
-      </client-set>
-    </task>
-    
-    <task name="FeedSystem" action="doFeed" container="libcacheserver" waitTime="630" parallel="true">
-      <data name="batchSize">1</data>
-      <data name="workTime">600</data>
-      <client-set>
-        <client name="ClientF1"></client>
-      </client-set>
-    </task>
-		
-    <task name="GII stress" action="doTwinkleRegion" container="libcacheserver" waitTime="630" parallel="true">
-      <data name="workTime">600</data>
-      <data name="regionName">CSRegion</data>
-      <data name="sleepTime">
-        <range high="120" low="30"></range>
-      </data>
-      <client-set exclude="true">
-        <client name="ClientF1"></client>
-      </client-set>
-    </task>
-    
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/34207.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/34207.xml b/src/tests/cpp/xml/Bugs/1.0RC1/34207.xml
deleted file mode 100755
index b9e88d3..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/34207.xml
+++ /dev/null
@@ -1,51 +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="maxTestTime">10200</data>
-  <data name="BBName">CacheServer</data>
-  <data name="systemName">CSTest</data>
-  <data name="cacheType">PEER</data>
-  <data name="scope">NACK</data>
-  <data name="regionName">CSRegion</data>
-  <client-set name="All">
-    <client name="Feeder"></client>
-    <client count="1" name="Server"></client>
-    <client count="600" name="Client"></client>
-  </client-set>
-
-  <test name="FeederUpdatesClientsGet" description="Feeder updates entries while clients do gets" waitTime="780">
-    <task name="CreateFeeder" action="createProcess" container="cacheserver" waitTime="600">
-      <data name="cacheType">PEER</data>
-      <client-set name="Feeders">
-          <client name="Feeder"></client>
-      </client-set>
-    </task>
-    <task name="CreateServers" action="createProcess" container="cacheserver" waitTime="600">
-      <data name="cacheType">SERVER</data>
-      <client-set name="Servers"> 
-        <client name="Server0"></client>
-      </client-set>
-    </task>
-    <task name="CreateClients" action="createProcess" container="cacheserver" waitTime="600">
-      <data name="cacheType">CLIENT</data>
-      <client-set name="Clients"> 
-        <client count="600" name="Client"> </client> 
-      </client-set>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="600">
-      <data name="batchSize">1</data>
-      <data name="workTime">120</data>
-      <client-set name="Feeders">
-        <client name="Feeder"></client> 
-      </client-set>
-    </task>
-    <task name="FeederUpdatesClientsGet" action="doEntryOperations" container="cacheserver" waitTime="6000">
-      <data name="workTime">120</data>
-      <data name="sleepTime">1</data>
-      <data name="entryOps">localDestroy</data>
-      <client-set name="FeederAndClients">
-        <client name="Feeder"></client>
-        <client count="600" name="Client"> </client> 
-      </client-set>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/34419.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/34419.xml b/src/tests/cpp/xml/Bugs/1.0RC1/34419.xml
deleted file mode 100755
index 4985c1e..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/34419.xml
+++ /dev/null
@@ -1,117 +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="keySize">
-    <range low="4" high="12"/>
-  </data>
-  <data name="distinctKeys">
-		10000
-	</data>
-  <data name="valueSizes">
-    <range low="0" high="85607"/>
-  </data>
-  <!-- Number of add ops is equal to number of destroy ops -->
-  <data name="entryOps">
-    <oneof>
-      <item>add</item>
-      <item>add</item>
-      <item>update</item>
-      <item>update</item>
-      <item>update</item>
-      <item>read</item>
-      <item>read</item>
-      <item>read</item>
-      <item>invalidate</item>
-      <item>localInvalidate</item>
-      <item>destroy</item>
-      <item>localDestroy</item>
-    </oneof>
-  </data>
-  <data name="opCount">
-    <range low="1" high="10"/>
-  </data>
-  <data name="minTaskGranularitySec">120</data>
-  <data name="maxRegions">100</data>
-  <data name="installListener">true</data>
-  <data name="installWriter">false</data>
-  <data name="installLoader">false</data>
-  <data-set name="NackMirrorNil">
-    <data name="regionName">NackMirrorNil</data>
-    <data name="scope">nack</data>
-    <data name="mirroring">true</data>
-    <data name="interestListEnabled">false</data>
-  </data-set>
-  <data-set name="NackNmirrorNil">
-    <data name="regionName">NackNmirrorNil</data>
-    <data name="scope">nack</data>
-    <data name="mirroring">false</data>
-    <data name="interestListEnabled">false</data>
-  </data-set>
-  <data-set name="NackMirrorIl">
-    <data name="regionName">NackMirrorIl</data>
-    <data name="scope">nack</data>
-    <data name="mirroring">true</data>
-    <data name="interestListEnabled">true</data>
-  </data-set>
-  <data-set name="NackNmirrorIl">
-    <data name="regionName">NackNmirrorIl</data>
-    <data name="scope">nack</data>
-    <data name="mirroring">false</data>
-    <data name="interestListEnabled">true</data>
-  </data-set>
-  <data-set name="NackNmirrorNcacheNil">
-    <data name="regionName">NackNmirrorNcacheNil</data>
-    <data name="scope">nack</data>
-    <data name="mirroring">false</data>
-    <data name="interestListEnabled">false</data>
-    <data name="cachingEnabled">false</data>
-  </data-set>
-  <data-set name="AckNmirrorNcacheNil">
-    <data name="regionName">AckNmirrorNcacheNil</data>
-    <data name="scope">ack</data>
-    <data name="mirroring">false</data>
-    <data name="interestListEnabled">false</data>
-    <data name="cachingEnabled">false</data>
-  </data-set>
-  <test name="All" description="Entry Event test" waitTime="5400">
-    <task name="NackMirrorNil doEntryOps" action="doEntryOperations" container="eventtest" waitTime="300" threadCount="4">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-		<task name="doSleep" action="doSleep" container="utils" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-    <task name="NackNmirrorNil doEntryOps" action="doEntryOperations" container="eventtest" waitTime="300" threadCount="4">
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="NackMirrorIl doEntryOps" action="doEntryOperations" container="eventtest" waitTime="300" threadCount="4">
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-		<task name="doSleep" action="doSleep" container="utils" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-    <task name="NackNmirrorIl doEntryOps" action="doEntryOperations" container="eventtest" waitTime="300" threadCount="4">
-      <data name="regionSpec">NackNmirrorIl</data>
-    </task>
-    <task name="NackNmirrorNcacheNil doEntryOps" action="doEntryOperations" container="eventtest" waitTime="300" threadCount="4">
-      <data name="regionSpec">NackNmirrorNcacheNil</data>
-    </task>
-    <task name="NackMixedNil doEntryOps" action="doEntryOperations" container="eventtest" waitTime="300" threadCount="4">
-      <data name="regionName">NackMixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>NackNmirrorNil</item>
-          <item>NackMirrorNil</item>
-          <item>NackNmirrorNcacheNil</item>
-        </oneof>
-      </data>
-    </task>
-    <task name="NackMixedIl doEntryOps" action="doEntryOperations" container="eventtest" waitTime="300" threadCount="4">
-      <data name="regionName">NackMixedIl</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>NackNmirrorIl</item>
-          <item>NackMirrorIl</item>
-        </oneof>
-      </data>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/cacheClose.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/cacheClose.xml b/src/tests/cpp/xml/Bugs/1.0RC1/cacheClose.xml
deleted file mode 100755
index 12e523b..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/cacheClose.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!-- Test for check get Initail Image and region content -->
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="valueSizes">100</data>
-  <data name="installWriter">false</data>
-  <data name="installLoader">false</data>
-  <data-set name="Local">
-    <data name="regionName">LocalRegion</data>
-    <data name="scope">local</data>
-  </data-set>
-  <data-set name="AckMirrorNil">
-    <data name="regionName">DistRegion</data>
-    <data name="scope">ack</data>
-    <data name="mirroring">true</data>
-    <data name="interestListEnabled">false</data>
-  </data-set>
-  <data-set name="AckNmirrorNil">
-    <data name="regionName">DistRegion</data>
-    <data name="scope">ack</data>
-    <data name="mirroring">false</data>
-    <data name="interestListEnabled">false</data>
-  </data-set>
-  <data-set name="NackMirrorNil">
-    <data name="regionName">DistRegion</data>
-    <data name="scope">nack</data>
-    <data name="mirroring">true</data>
-    <data name="interestListEnabled">false</data>
-  </data-set>
-  <data-set name="NackNmirrorNil">
-    <data name="regionName">DistRegion</data>
-    <data name="scope">nack</data>
-    <data name="mirroring">false</data>
-    <data name="interestListEnabled">false</data>
-  </data-set>
-  <client-set name="CacheChecker">
-    <client count="40" name="Client" />
-  </client-set>
-  <data name="EntryCount">1000</data>
-  <test name="CheckRegionContent" description="AckMirrorNil Validating Cache Content Test">
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNil</data>
-      <client-set exclude="true">
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNil</data>
-      <data name="installListener">true</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="PopulateRegion" action="doAddEntry" container="eventtest" waitTime="1200">
-      <data name="regionName">DistRegionA</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doCreateLocalRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">LocalRegionA</data>
-      <data name="regionSpec">Local</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doIterateOnEntry" action="doIterateOnEntry" container="eventtest" waitTime="1200">
-      <data name="testRegion">DistRegionA</data>
-      <data name="validateRegion">LocalRegionA</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="regionContentValidation" action="doValidateRegionContent" container="eventtest"
-      waitTime="1200">
-      <data name="testRegion">DistRegionA</data>
-      <data name="validateRegion">LocalRegionA</data>
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNil</data>
-      <data name="installListener">true</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="Close Cache" action="doCacheClose" container="eventtest" waitTime="1200"/>
-  </test>
-  <test name="CheckRegionContent" description="AckNmirrorNil Validating Cache Content Test">
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionB</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-      <client-set exclude="true">
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionB</data>
-      <data name="regionSpec">AckMirrorNil</data>
-      <data name="installListener">true</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doCreateLocalRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">LocalRegionB</data>
-      <data name="regionSpec">Local</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="PopulateRegion" action="doAddEntry" container="eventtest" waitTime="1200">
-      <data name="usePID">1</data>
-      <data name="regionName">DistRegionB</data>
-      <client-set exclude="true">
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doIterateOnEntry" action="doIterateOnEntry" container="eventtest" waitTime="1200">
-      <data name="testRegion">DistRegionB</data>
-      <data name="validateRegion">LocalRegionB</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="regionContentValidation" action="doValidateRegionContent" container="eventtest"
-      waitTime="1200">
-      <data name="testRegion">DistRegionB</data>
-      <data name="validateRegion">LocalRegionB</data>
-      <data name="regionName">DistRegionB</data>
-      <data name="regionSpec">AckMirrorNil</data>
-      <data name="installListener">true</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="Close Cache" action="doCacheClose" container="eventtest" waitTime="1200"/>
-  </test>
-  <test name="CheckRegionContent" description="NackMirrorNil Validating Cache Content Test">
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionC</data>
-      <data name="regionSpec">NackMirrorNil</data>
-      <client-set exclude="true">
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionC</data>
-      <data name="regionSpec">NackMirrorNil</data>
-      <data name="installListener">true</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="PopulateRegion" action="doAddEntry" container="eventtest" waitTime="1200">
-      <data name="regionName">DistRegionC</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doCreateLocalRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">LocalRegionC</data>
-      <data name="regionSpec">Local</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doIterateOnEntry" action="doIterateOnEntry" container="eventtest" waitTime="1200">
-      <data name="testRegion">DistRegionC</data>
-      <data name="validateRegion">LocalRegionC</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="regionContentValidation" action="doValidateRegionContent" container="eventtest"
-      waitTime="1200">
-      <data name="testRegion">DistRegionC</data>
-      <data name="validateRegion">LocalRegionC</data>
-      <data name="regionName">DistRegionC</data>
-      <data name="regionSpec">NackMirrorNil</data>
-      <data name="installListener">true</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="Close Cache" action="doCacheClose" container="eventtest" waitTime="1200"/>
-  </test>
-  <test name="CheckRegionContent" description="NackNmirrorNil Validating Cache Content Test">
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionD</data>
-      <data name="regionSpec">NackNmirrorNil</data>
-      <client-set exclude="true">
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionD</data>
-      <data name="regionSpec">NackMirrorNil</data>
-      <data name="installListener">true</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doCreateLocalRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">LocalRegionD</data>
-      <data name="regionSpec">Local</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="PopulateRegion" action="doAddEntry" container="eventtest" waitTime="1200">
-      <data name="usePID">1</data>
-      <data name="regionName">DistRegionD</data>
-      <client-set exclude="true">
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="doIterateOnEntry" action="doIterateOnEntry" container="eventtest" waitTime="1200">
-      <data name="testRegion">DistRegionD</data>
-      <data name="validateRegion">LocalRegionD</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="regionContentValidation" action="doValidateRegionContent" container="eventtest"
-      waitTime="1200">
-      <data name="testRegion">DistRegionD</data>
-      <data name="validateRegion">LocalRegionD</data>
-      <data name="regionName">DistRegionD</data>
-      <data name="regionSpec">NackMirrorNil</data>
-      <data name="installListener">true</data>
-      <client-set>
-        <client name="Client0" />
-      </client-set>
-    </task>
-    <task name="Close Cache" action="doCacheClose" container="eventtest" waitTime="1200"/>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/perfTest_bug33789.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/perfTest_bug33789.xml b/src/tests/cpp/xml/Bugs/1.0RC1/perfTest_bug33789.xml
deleted file mode 100755
index 91d89a4..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/perfTest_bug33789.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data> 
-  
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  
-	<data name="valueSizes">
-		<list>
-			<item>100</item>
-			<item>500</item>
-			<item>1000</item>
-			<item>2000</item>
-			<item>4000</item>
-			<item>8000</item>
-		</list>
-	</data>
-	
-	<data name="numThreads">
-		<list>
-			<item>1</item>
-			<item>2</item>
-			<item>3</item>
-			<item>4</item>
-			<item>7</item>
-			<item>10</item>
-		</list>
-	</data>
-
-  <data name="distinctKeysForDestroyTask">
-    <list>
-      <item>10000</item>
-      <item>100000</item>
-      <item>1000000</item>
-    </list>
-  </data>
-  	
-	<data name="haltIfBadResult">true</data>
-	<data name="installListener">false</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	
-	<data-set name="Local">
-		<data name="regionName">Local</data>
-		<data name="scope">local</data>
-	</data-set>
-	<data-set name="AckMirrorNil">
-		<data name="regionName">AckMirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackMirrorNil">
-		<data name="regionName">NackMirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackNmirrorNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckMirrorIl">
-		<data name="regionName">AckMirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackMirrorIl">
-		<data name="regionName">NackMirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="AckNmirrorIl">
-		<data name="regionName">AckNmirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackNmirrorIl">
-		<data name="regionName">NackNmirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackNmirrorNcacheNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-		<data name="cachingEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNcacheNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-		<data name="cachingEnabled">false</data>
-	</data-set>
-	
-	<client-set name="Driver">
-		<client name="Producer"/>
-	</client-set>
-	
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Entry Event test">
-		<task name="CreateRegion-AckMirrorNil" action="doCreateRegion" container="perftests" waitTime="60">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-    <!-- task name="EmptyGets" action="doGets" container="perftests" waitTime="1780">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task -->
-    <!--task name="Puts" action="doPuts" container="perftests" waitTime="1780">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task -->
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="1780">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>    
-	</test>
-	
-	<test name="NackMirrorNil" description="NackMirrorNil Entry Event test">
-		<task name="CreateRegion-NackMirrorNil" action="doCreateRegion" container="perftests" waitTime="60">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-    <!-- task name="EmptyGets" action="doGets" container="perftests" waitTime="1780">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task -->
-    <!--task name="Puts" action="doPuts" container="perftests" waitTime="1780">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task -->
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="1780">
-      <client-set name="Driver">
-        <client name="Producer"/>
-      </client-set>
-    </task>    
-	</test>
-	
-</test-driver>


[36/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/failoverTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/failoverTest.xml b/src/tests/cpp/xml/Generics/Native/failoverTest.xml
deleted file mode 100644
index 4b7d3bc..0000000
--- a/src/tests/cpp/xml/Generics/Native/failoverTest.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="minServers">1</data>
- 
-	
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-	
-  <test name="YAPerfTest" description="Thin Client perf test">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csAckMirrorQsize.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="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set count="5" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="3" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-    <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/Native/getAllTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/getAllTest.xml b/src/tests/cpp/xml/Generics/Native/getAllTest.xml
deleted file mode 100644
index 42f3faf..0000000
--- a/src/tests/cpp/xml/Generics/Native/getAllTest.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="expectedCount">100000</data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="150000" 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"/>
-  <client-set name="Subscriber2"/>
-
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>2000</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests"  timesToRun="3" waitTime="15m" parallel="true" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests"  timesToRun="3" waitTime="15m" parallel="true" argTypes="String,byte[]">
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-      <data name="invalidateRegion">true</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/perfBenchmarkTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfBenchmarkTCR.xml b/src/tests/cpp/xml/Generics/Native/perfBenchmarkTCR.xml
deleted file mode 100644
index 7db492d..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfBenchmarkTCR.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="clientCount">2</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="JCS" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-identical" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Puts-identical" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys-identical" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-overlap1" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-overlap2" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">2500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-overlap1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-overlap2" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">2500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-overlap1" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-overlap2" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">2500</data>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-non-overlap1" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-non-overlap2" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">5000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-non-overlap1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-non-overlap2" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">5000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-non-overlap1" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2h" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-non-overlap2" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2h" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">5000</data>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/perfClientsUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfClientsUpdateTest.xml b/src/tests/cpp/xml/Generics/Native/perfClientsUpdateTest.xml
deleted file mode 100644
index 48aa9c3..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfClientsUpdateTest.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>1000</item>
-      <item>100</item>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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/csAckMirrorQsize.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Puts" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="90m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/perfCyberTraderLatencyPut.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfCyberTraderLatencyPut.xml b/src/tests/cpp/xml/Generics/Native/perfCyberTraderLatencyPut.xml
deleted file mode 100644
index 7c58977..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfCyberTraderLatencyPut.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-      <!--item>1000</item>
-      <item>10000</item>
-      <item>100000</item>
-      <item>184877</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>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListenerP"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="regionSpec">ThinClientRegionListener</data>
-    </task>
-    <task name="Measure Put doLatencyPuts" action="doLatencyPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="regionSpec">ThinClientRegionListener</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="PutEntries" action="doLatencyPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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/Native/perfCyberTraderPutGetThroughput.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfCyberTraderPutGetThroughput.xml b/src/tests/cpp/xml/Generics/Native/perfCyberTraderPutGetThroughput.xml
deleted file mode 100644
index dd12b8d..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfCyberTraderPutGetThroughput.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>
-
-  <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Destroys Entries" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2h" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="PutEntries" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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/Native/perfTCROverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTCROverflowToDisk.xml b/src/tests/cpp/xml/Generics/Native/perfTCROverflowToDisk.xml
deleted file mode 100644
index 6857be7..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTCROverflowToDisk.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-      <item>1000</item>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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/csServerOverflowToDisk.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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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/Native/perfTCRServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTCRServerEviction.xml b/src/tests/cpp/xml/Generics/Native/perfTCRServerEviction.xml
deleted file mode 100644
index c479cb4..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTCRServerEviction.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>100</item>
-      <item>1000</item -->
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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 Generics/Native/csServerOverflowToDisk.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="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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/Native/perfTestPutGetDestroyTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCR.xml b/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCR.xml
deleted file mode 100644
index cd43d0f..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCR.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <!--item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-             <!--item>5000</item>
-             <item>10000</item-->
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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="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="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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/Native/perfTestPutGetDestroyTCRscaledUp.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCRscaledUp.xml b/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCRscaledUp.xml
deleted file mode 100644
index ec3fc87..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCRscaledUp.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-      <item>1000</item>
-      <item>10000</item>
-      <!--item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-             <!--item>5000</item>
-             <item>10000</item-->
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-  <client-set name="Putter3"/>
-  <client-set name="Getter3"/>
-  <client-set name="Destroyer3"/>
-  <client-set name="Putter4"/>
-  <client-set name="Getter4"/>
-  <client-set name="Destroyer4"/>
-	
-  <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="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="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="5m">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-	   <!-- create region and measure throughput for putter,getter,destroyer - 3 -->
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="5m">
-      <client-set name="Putter3"/>
-      <client-set name="Getter3"/>
-      <client-set name="Destroyer3"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Putter3"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Getter3"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Destroyer3"/>
-    </task>
-	   <!-- create region and measure throughput for putter,getter,destroyer - 4 -->
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="5m">
-      <client-set name="Putter4"/>
-      <client-set name="Getter4"/>
-      <client-set name="Destroyer4"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Putter4"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Getter4"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Destroyer4"/>
-    </task>
-	   <!-- stopping all the 4 servers -->
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" 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/Native/perfTestPutGetDestroy_FullInterestTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_FullInterestTCR.xml b/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_FullInterestTCR.xml
deleted file mode 100644
index c92cb21..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_FullInterestTCR.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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/Native/perfTestPutGetDestroy_PartialInterestTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_PartialInterestTCR.xml b/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_PartialInterestTCR.xml
deleted file mode 100644
index e441b77..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_PartialInterestTCR.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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/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="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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/Native/putGetAllTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/putGetAllTest.xml b/src/tests/cpp/xml/Generics/Native/putGetAllTest.xml
deleted file mode 100644
index 5e74d87..0000000
--- a/src/tests/cpp/xml/Generics/Native/putGetAllTest.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="expectedCount">100000</data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="150000" 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"/>
-  <client-set name="Subscriber2"/>
-
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPutAll" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPutAll" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>2000</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests"  timesToRun="3" waitTime="15m" parallel="true" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests"  timesToRun="3" waitTime="15m" parallel="true" argTypes="String,byte[]">
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-      <data name="invalidateRegion">true</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-</test-driver>


[08/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/conflationTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/conflationTest.xml b/src/tests/cpp/xml/Native/conflationTest.xml
deleted file mode 100644
index 1056cb2..0000000
--- a/src/tests/cpp/xml/Native/conflationTest.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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/csConflationNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </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/Native/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csAckMirror.xml b/src/tests/cpp/xml/Native/csAckMirror.xml
deleted file mode 100644
index 019868a..0000000
--- a/src/tests/cpp/xml/Native/csAckMirror.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csAckMirrorConflate.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csAckMirrorConflate.xml b/src/tests/cpp/xml/Native/csAckMirrorConflate.xml
deleted file mode 100644
index 0215767..0000000
--- a/src/tests/cpp/xml/Native/csAckMirrorConflate.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" message-time-to-live="3600" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" enable-subscription-conflation="true">
-      <cache-listener>
-         <class-name>javaobject.CacheListenerForConflation</class-name>
-       </cache-listener>
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csAckMirrorNoConflate.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csAckMirrorNoConflate.xml b/src/tests/cpp/xml/Native/csAckMirrorNoConflate.xml
deleted file mode 100644
index 02ecd4b..0000000
--- a/src/tests/cpp/xml/Native/csAckMirrorNoConflate.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" message-time-to-live="3600" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" >
-      <cache-listener>
-         <class-name>javaobject.CacheListenerForConflation</class-name>
-       </cache-listener>
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csAckMirrorQsize.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csAckMirrorQsize.xml b/src/tests/cpp/xml/Native/csAckMirrorQsize.xml
deleted file mode 100644
index 99da0ac..0000000
--- a/src/tests/cpp/xml/Native/csAckMirrorQsize.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csAckMirrorSecurity.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csAckMirrorSecurity.xml b/src/tests/cpp/xml/Native/csAckMirrorSecurity.xml
deleted file mode 100755
index 28a85de..0000000
--- a/src/tests/cpp/xml/Native/csAckMirrorSecurity.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csConflationNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csConflationNotifySubscription.xml b/src/tests/cpp/xml/Native/csConflationNotifySubscription.xml
deleted file mode 100644
index 772a781..0000000
--- a/src/tests/cpp/xml/Native/csConflationNotifySubscription.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" enable-subscription-conflation="true">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csHlru.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csHlru.xml b/src/tests/cpp/xml/Native/csHlru.xml
deleted file mode 100644
index 8549655..0000000
--- a/src/tests/cpp/xml/Native/csHlru.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="500" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csMirror.xml b/src/tests/cpp/xml/Native/csMirror.xml
deleted file mode 100644
index fdca041..0000000
--- a/src/tests/cpp/xml/Native/csMirror.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csMultiRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csMultiRegion.xml b/src/tests/cpp/xml/Native/csMultiRegion.xml
deleted file mode 100644
index 4d6ef85..0000000
--- a/src/tests/cpp/xml/Native/csMultiRegion.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<cache-server port="$PORT_NUM" />
-	
-	<region name="receiveValueTrue">
-		<region-attributes scope="distributed-ack" data-policy="replicate" />
-	</region>
-	
-	<region name="receiveValueFalse">
-		<region-attributes scope="distributed-ack" data-policy="replicate"/>
-	</region>
-	<region name="receiveValueNone">
-		<region-attributes scope="distributed-ack" data-policy="replicate"/>
-	</region>
-	
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csNoNotifyBySubscriptionServerCache.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csNoNotifyBySubscriptionServerCache.xml b/src/tests/cpp/xml/Native/csNoNotifyBySubscriptionServerCache.xml
deleted file mode 100644
index 7dcafd9..0000000
--- a/src/tests/cpp/xml/Native/csNoNotifyBySubscriptionServerCache.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<cache-server port="$PORT_NUM" />
-	
-	<region name="notifyBySubscriptionRegion">
-		<region-attributes scope="distributed-ack" data-policy="replicate" statistics-enabled="true" />
-	</region>
-	
-	<region name="noNotifyBySubscriptionRegion">
-		<region-attributes scope="distributed-ack" data-policy="replicate" statistics-enabled="true" />
-	</region>
-	
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csNotifyBySubscriptionServerCache.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csNotifyBySubscriptionServerCache.xml b/src/tests/cpp/xml/Native/csNotifyBySubscriptionServerCache.xml
deleted file mode 100644
index 7dcafd9..0000000
--- a/src/tests/cpp/xml/Native/csNotifyBySubscriptionServerCache.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	<cache-server port="$PORT_NUM" />
-	
-	<region name="notifyBySubscriptionRegion">
-		<region-attributes scope="distributed-ack" data-policy="replicate" statistics-enabled="true" />
-	</region>
-	
-	<region name="noNotifyBySubscriptionRegion">
-		<region-attributes scope="distributed-ack" data-policy="replicate" statistics-enabled="true" />
-	</region>
-	
-</cache>

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csServerEviction.xml b/src/tests/cpp/xml/Native/csServerEviction.xml
deleted file mode 100644
index 8eabf2d..0000000
--- a/src/tests/cpp/xml/Native/csServerEviction.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack">
-      <eviction-attributes>
-        <lru-heap-percentage maximum="70" time-interval="100"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/csServerOverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/csServerOverflowToDisk.xml b/src/tests/cpp/xml/Native/csServerOverflowToDisk.xml
deleted file mode 100644
index f271470..0000000
--- a/src/tests/cpp/xml/Native/csServerOverflowToDisk.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" persist-backup="true">
-      <eviction-attributes>
-        <lru-heap-percentage maximum="70" time-interval="100" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/failoverTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/failoverTest.xml b/src/tests/cpp/xml/Native/failoverTest.xml
deleted file mode 100644
index 1d329fa..0000000
--- a/src/tests/cpp/xml/Native/failoverTest.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="minServers">1</data>
- 
-	
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-	
-  <test name="YAPerfTest" description="Thin Client perf test">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csAckMirrorQsize.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="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="5" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="3" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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/Native/getAllTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/getAllTest.xml b/src/tests/cpp/xml/Native/getAllTest.xml
deleted file mode 100644
index 533d942..0000000
--- a/src/tests/cpp/xml/Native/getAllTest.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="expectedCount">100000</data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="150000" 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"/>
-  <client-set name="Subscriber2"/>
-
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>2000</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests"  timesToRun="3" waitTime="15m" parallel="true">
-      <client-set name="Subscriber"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests"  timesToRun="3" waitTime="15m" parallel="true">
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-      <data name="invalidateRegion">true</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/perfBenchmarkTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/perfBenchmarkTCR.xml b/src/tests/cpp/xml/Native/perfBenchmarkTCR.xml
deleted file mode 100644
index 2ee8d26..0000000
--- a/src/tests/cpp/xml/Native/perfBenchmarkTCR.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="clientCount">2</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="JCS" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-identical" action="doGets" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Puts-identical" action="doPuts" container="perftests" waitTime="15m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys-identical" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-overlap1" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-overlap2" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">2500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-overlap1" action="doPuts" container="perftests" waitTime="15m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-overlap2" action="doPuts" container="perftests" waitTime="15m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">2500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-overlap1" action="doDestroys" container="perftests" waitTime="30m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-overlap2" action="doDestroys" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">2500</data>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-non-overlap1" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-non-overlap2" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">5000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-non-overlap1" action="doPuts" container="perftests" waitTime="15m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-non-overlap2" action="doPuts" container="perftests" waitTime="15m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">5000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-non-overlap1" action="doDestroys" container="perftests" waitTime="2h" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-non-overlap2" action="doDestroys" container="perftests" waitTime="2h" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">5000</data>
-    </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="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/perfClientsUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/perfClientsUpdateTest.xml b/src/tests/cpp/xml/Native/perfClientsUpdateTest.xml
deleted file mode 100644
index a071cea..0000000
--- a/src/tests/cpp/xml/Native/perfClientsUpdateTest.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>1000</item>
-      <item>100</item>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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/csAckMirrorQsize.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="perftests" waitTime="45m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="30m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="perftests" waitTime="45m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="15m">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="perftests" waitTime="45m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="90m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="perftests" waitTime="45m">
-      <client-set name="Feeder"/>
-    </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="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/perfCyberTraderLatencyPut.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/perfCyberTraderLatencyPut.xml b/src/tests/cpp/xml/Native/perfCyberTraderLatencyPut.xml
deleted file mode 100644
index ab9aff7..0000000
--- a/src/tests/cpp/xml/Native/perfCyberTraderLatencyPut.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-      <!--item>1000</item>
-      <item>10000</item>
-      <item>100000</item>
-      <item>184877</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>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <data name="regionSpec">ThinClientRegionListener</data>
-    </task>
-    <task name="Measure Put doLatencyPuts" action="doLatencyPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <data name="regionSpec">ThinClientRegionListener</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="PutEntries" action="doLatencyPuts" 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/Native/perfCyberTraderPutGetThroughput.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/perfCyberTraderPutGetThroughput.xml b/src/tests/cpp/xml/Native/perfCyberTraderPutGetThroughput.xml
deleted file mode 100644
index 04236ea..0000000
--- a/src/tests/cpp/xml/Native/perfCyberTraderPutGetThroughput.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>
-
-  <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="perftests" 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="Destroys Entries" action="doDestroys" container="perftests" waitTime="2h">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" 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="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/Native/perfTCROverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/perfTCROverflowToDisk.xml b/src/tests/cpp/xml/Native/perfTCROverflowToDisk.xml
deleted file mode 100644
index 13ad2d3..0000000
--- a/src/tests/cpp/xml/Native/perfTCROverflowToDisk.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-      <item>1000</item>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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/csServerOverflowToDisk.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="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="45m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="45m">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="45m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="45m">
-      <client-set name="Destroyer2"/>
-    </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/Native/perfTCRServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/perfTCRServerEviction.xml b/src/tests/cpp/xml/Native/perfTCRServerEviction.xml
deleted file mode 100644
index 1661e0c..0000000
--- a/src/tests/cpp/xml/Native/perfTCRServerEviction.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>100</item>
-      <item>1000</item -->
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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/csServerEviction.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="perftests" waitTime="3m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="7m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="7m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="7m">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="7m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="7m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="7m">
-      <client-set name="Destroyer2"/>
-    </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/Native/perfTestPutGetDestroyTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/perfTestPutGetDestroyTCR.xml b/src/tests/cpp/xml/Native/perfTestPutGetDestroyTCR.xml
deleted file mode 100644
index 1e65db8..0000000
--- a/src/tests/cpp/xml/Native/perfTestPutGetDestroyTCR.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <!--item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-             <!--item>5000</item>
-             <item>10000</item-->
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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="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="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </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/Native/perfTestPutGetDestroyTCRscaledUp.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/perfTestPutGetDestroyTCRscaledUp.xml b/src/tests/cpp/xml/Native/perfTestPutGetDestroyTCRscaledUp.xml
deleted file mode 100644
index 4dbbfa8..0000000
--- a/src/tests/cpp/xml/Native/perfTestPutGetDestroyTCRscaledUp.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-      <item>1000</item>
-      <item>10000</item>
-      <!--item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-             <!--item>5000</item>
-             <item>10000</item-->
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-  <client-set name="Putter3"/>
-  <client-set name="Getter3"/>
-  <client-set name="Destroyer3"/>
-  <client-set name="Putter4"/>
-  <client-set name="Getter4"/>
-  <client-set name="Destroyer4"/>
-	
-  <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="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="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-	   <!-- create region and measure throughput for putter,getter,destroyer - 3 -->
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter3"/>
-      <client-set name="Getter3"/>
-      <client-set name="Destroyer3"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter3"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter3"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer3"/>
-    </task>
-	   <!-- create region and measure throughput for putter,getter,destroyer - 4 -->
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter4"/>
-      <client-set name="Getter4"/>
-      <client-set name="Destroyer4"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter4"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter4"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer4"/>
-    </task>
-	   <!-- stopping all the 4 servers -->
-
-    <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/Native/perfTestPutGetDestroy_FullInterestTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/perfTestPutGetDestroy_FullInterestTCR.xml b/src/tests/cpp/xml/Native/perfTestPutGetDestroy_FullInterestTCR.xml
deleted file mode 100644
index 8c8f1fc..0000000
--- a/src/tests/cpp/xml/Native/perfTestPutGetDestroy_FullInterestTCR.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </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/Native/perfTestPutGetDestroy_PartialInterestTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/perfTestPutGetDestroy_PartialInterestTCR.xml b/src/tests/cpp/xml/Native/perfTestPutGetDestroy_PartialInterestTCR.xml
deleted file mode 100644
index ee75a24..0000000
--- a/src/tests/cpp/xml/Native/perfTestPutGetDestroy_PartialInterestTCR.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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/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="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </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>


[51/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
GEODE-2332: Deleted deprecated test framework support files.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/86df4a7c
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/86df4a7c
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/86df4a7c

Branch: refs/heads/next-gen-native-client-software-grant
Commit: 86df4a7c2a995be8e60185fbb90ff19e291c2c4f
Parents: 512b345
Author: Jacob Barrett <jb...@pivotal.io>
Authored: Sat Jan 21 09:45:54 2017 -0800
Committer: Jacob Barrett <jb...@pivotal.io>
Committed: Sat Jan 21 09:45:54 2017 -0800

----------------------------------------------------------------------
 src/tests/cpp/xml/64bit/csAckMirror.xml         |   10 -
 src/tests/cpp/xml/64bit/memoryMeasurement.xml   |   96 -
 .../AppDomainTest/clientEventsAppDomainTest.xml |  113 -
 .../clientEventsFailoverAppDomain.xml           |  174 -
 .../clientEventsHAFailoverAppDomain.xml         |  175 -
 .../xml/AppDomainTest/getAllAppDomainTest.xml   |  174 -
 .../perfClientsUpdateAppDomainTest.xml          |  108 -
 .../AppDomainTest/putGetAllAppDomainTest.xml    |  174 -
 src/tests/cpp/xml/Bugs/1.0RC1/33104.xml         |  204 --
 src/tests/cpp/xml/Bugs/1.0RC1/33104N.xml        |  204 --
 src/tests/cpp/xml/Bugs/1.0RC1/33122.xml         |  276 --
 src/tests/cpp/xml/Bugs/1.0RC1/33165.xml         |   73 -
 src/tests/cpp/xml/Bugs/1.0RC1/33165AM.xml       |   27 -
 src/tests/cpp/xml/Bugs/1.0RC1/33165ANM.xml      |   25 -
 src/tests/cpp/xml/Bugs/1.0RC1/33165L.xml        |   25 -
 src/tests/cpp/xml/Bugs/1.0RC1/33165NM.xml       |   25 -
 src/tests/cpp/xml/Bugs/1.0RC1/33165NNM.xml      |   27 -
 src/tests/cpp/xml/Bugs/1.0RC1/33166.xml         |  177 -
 src/tests/cpp/xml/Bugs/1.0RC1/33169.xml         |   49 -
 src/tests/cpp/xml/Bugs/1.0RC1/33183.xml         |   67 -
 src/tests/cpp/xml/Bugs/1.0RC1/33192.xml         |   80 -
 src/tests/cpp/xml/Bugs/1.0RC1/33198.xml         |  277 --
 src/tests/cpp/xml/Bugs/1.0RC1/33242.xml         |  370 --
 src/tests/cpp/xml/Bugs/1.0RC1/33502.xml         |   52 -
 src/tests/cpp/xml/Bugs/1.0RC1/34207.xml         |   51 -
 src/tests/cpp/xml/Bugs/1.0RC1/34419.xml         |  117 -
 src/tests/cpp/xml/Bugs/1.0RC1/cacheClose.xml    |  236 --
 .../cpp/xml/Bugs/1.0RC1/perfTest_bug33789.xml   |  161 -
 src/tests/cpp/xml/Bugs/32152.xml                | 1598 ---------
 src/tests/cpp/xml/Bugs/33201.xml                |   87 -
 src/tests/cpp/xml/Bugs/34647.xml                |   63 -
 src/tests/cpp/xml/CqQuery/concCQMTTest.xml      |  109 -
 src/tests/cpp/xml/CqQuery/cqDurableQS.xml       |  183 -
 src/tests/cpp/xml/CqQuery/csAckMirror.xml       |   14 -
 .../cpp/xml/CqQuery/durableCqFailoverR2.xml     |  208 --
 .../cpp/xml/CqQuery/durableTimeoutWithCq.xml    |  147 -
 .../cpp/xml/CqQuery/durableWithCqKAFalse.xml    |  148 -
 .../cpp/xml/CqQuery/durableWithCqKATrue.xml     |  148 -
 src/tests/cpp/xml/CqQuery/multRegCQOps.xml      |  127 -
 .../CqQuery/multRegServerFailoverAndCQOps.xml   |  157 -
 .../CqQuery/registerAllKeysGIIValueCqTest.xml   |  205 --
 .../xml/CqQuery/resultSetValidationCQTest.xml   |  139 -
 src/tests/cpp/xml/CqQuery/serialCQMTTest.xml    |  110 -
 src/tests/cpp/xml/CqQuery/serialEntryEvent.xml  |  216 --
 .../CqQuery/serialEntryEventWithRegInterest.xml |  216 --
 .../serialMultRegOpsCQListenerWithFeeder.xml    |  236 --
 .../cpp/xml/CqQuery/serverFailoverAndCQOps.xml  |  149 -
 src/tests/cpp/xml/CqQuery/singleRegCQOps.xml    |  120 -
 .../cpp/xml/Delta/cacheserver_with_deltaobj.xml |   22 -
 src/tests/cpp/xml/Delta/csDeltaEviction.xml     |   33 -
 src/tests/cpp/xml/Delta/csDeltaNoConflate.xml   |   23 -
 src/tests/cpp/xml/Delta/csDeltaOverflow.xml     |   25 -
 src/tests/cpp/xml/Delta/csDeltaPR.xml           |   28 -
 .../xml/Delta/deltaPropogationFailoverForPR.xml |  185 -
 .../deltaPropogationFailoverNoConflation.xml    |  187 --
 .../cpp/xml/Delta/deltaPropogationForPR.xml     |  122 -
 .../xml/Delta/deltaPropogationNoConflation.xml  |  148 -
 .../Delta/deltaPropogationWithEvictionForPR.xml |  125 -
 .../xml/Delta/deltaPropogationWithOverFlow.xml  |  181 -
 src/tests/cpp/xml/Delta/deltaSampleTest.xml     |  106 -
 src/tests/cpp/xml/DurableClient/csAckMirror.xml |   10 -
 .../xml/DurableClient/csNotifySubsNoLimit.xml   |   14 -
 .../xml/DurableClient/csNotifySubscription.xml  |   14 -
 .../cpp/xml/DurableClient/durableFailoverR2.xml |  257 --
 .../DurableClient/durableNonDurableCrash.xml    |  253 --
 .../DurableClient/durableNonDurableKAFalse.xml  |  218 --
 .../DurableClient/durableNonDurableKATrue.xml   |  221 --
 .../DurableClient/durableNonDurableTimeout.xml  |  221 --
 .../durablePR/csNotifySubsNoLimit.xml           |   12 -
 .../durablePR/csNotifySubscription.xml          |   12 -
 .../durablePR/durableFailoverR2.xml             |  256 --
 .../durablePR/durableNonDurableCrash.xml        |  264 --
 .../durablePR/durableNonDurableKAFalse.xml      |  229 --
 .../durablePR/durableNonDurableKATrue.xml       |  232 --
 .../durablePR/durableNonDurableTimeout.xml      |  233 --
 .../xml/DurableClient/durablePerfEventCount.xml |  136 -
 .../durablePerfPutGetThroughput.xml             |  122 -
 .../DurableClient/durablePerfVariableTest.xml   |  128 -
 .../DurableClient/durablePerfVariableTest2.xml  |  211 --
 .../durablePerfVariableTestWithHLRU.xml         |  222 --
 .../cpp/xml/FunctionExecution/FEPRSingleHop.xml |  193 --
 .../FESingleHopNonOptimized.xml                 |  139 -
 .../FunctionExecution/FESingleHopOptimized.xml  |  139 -
 .../xml/FunctionExecution/csEmptyDataPolicy.xml |   25 -
 .../FunctionExecution/csFEPartitionedRegion.xml |   36 -
 .../xml/FunctionExecution/csPartitionRegion.xml |   32 -
 .../csPartitionRegionForFEHA.xml                |   17 -
 .../xml/FunctionExecution/csReplicatedPR.xml    |   23 -
 .../FunctionExecution/csReplicatedRegion.xml    |   25 -
 .../xml/FunctionExecution/exceptionHandling.xml |  152 -
 .../FunctionExecution/functionExecutionHA.xml   |  122 -
 .../nonPRFunctionExecuteTest.xml                |   97 -
 .../onRegionFunctionExecHAWithResult.xml        |  124 -
 .../onRegionFunctionExecWithOutResult.xml       |  108 -
 .../onRegionFunctionExecWithResult.xml          |  108 -
 .../onServerFunctionExecWithOutResult.xml       |  107 -
 .../onServerFunctionExecWithResult.xml          |  107 -
 .../onServersFunctionExecWithOutResult.xml      |  107 -
 .../onServersFunctionExecWithResult.xml         |  107 -
 .../replicatedRegionExecution.xml               |  109 -
 .../cpp/xml/Generics/CqQuery/concCQMTTest.xml   |  110 -
 .../cpp/xml/Generics/CqQuery/cqDurableQS.xml    |  176 -
 .../cpp/xml/Generics/CqQuery/csAckMirror.xml    |   14 -
 .../Generics/CqQuery/durableCqFailoverR2.xml    |  208 --
 .../Generics/CqQuery/durableTimeoutWithCq.xml   |  147 -
 .../Generics/CqQuery/durableWithCqKAFalse.xml   |  148 -
 .../Generics/CqQuery/durableWithCqKATrue.xml    |  148 -
 .../cpp/xml/Generics/CqQuery/multRegCQOps.xml   |  127 -
 .../CqQuery/multRegServerFailoverAndCQOps.xml   |  157 -
 .../CqQuery/resultSetValidationCQTest.xml       |  140 -
 .../cpp/xml/Generics/CqQuery/serialCQMTTest.xml |  108 -
 .../xml/Generics/CqQuery/serialEntryEvent.xml   |  216 --
 .../CqQuery/serialEntryEventWithRegInterest.xml |  228 --
 .../serialMultRegOpsCQListenerWithFeeder.xml    |  233 --
 .../Generics/CqQuery/serverFailoverAndCQOps.xml |  149 -
 .../cpp/xml/Generics/CqQuery/singleRegCQOps.xml |  120 -
 .../Delta/cacheserver_with_deltaobj.xml         |   22 -
 .../cpp/xml/Generics/Delta/csDeltaEviction.xml  |   33 -
 .../xml/Generics/Delta/csDeltaNoConflate.xml    |   23 -
 .../cpp/xml/Generics/Delta/csDeltaOverflow.xml  |   25 -
 src/tests/cpp/xml/Generics/Delta/csDeltaPR.xml  |   28 -
 .../Delta/deltaPropogationFailoverForPR.xml     |  185 -
 .../deltaPropogationFailoverNoConflation.xml    |  187 --
 .../Generics/Delta/deltaPropogationForPR.xml    |  122 -
 .../Delta/deltaPropogationNoConflation.xml      |  148 -
 .../Delta/deltaPropogationWithEvictionForPR.xml |  125 -
 .../Delta/deltaPropogationWithOverFlow.xml      |  181 -
 .../cpp/xml/Generics/Delta/deltaSampleTest.xml  |  106 -
 .../xml/Generics/DurableClient/csAckMirror.xml  |   10 -
 .../DurableClient/csNotifySubsNoLimit.xml       |   14 -
 .../DurableClient/csNotifySubscription.xml      |   14 -
 .../DurableClient/durableFailoverR2.xml         |  257 --
 .../DurableClient/durableNonDurableCrash.xml    |  253 --
 .../DurableClient/durableNonDurableKAFalse.xml  |  218 --
 .../DurableClient/durableNonDurableKATrue.xml   |  221 --
 .../DurableClient/durableNonDurableTimeout.xml  |  221 --
 .../durablePR/csNotifySubsNoLimit.xml           |   12 -
 .../durablePR/csNotifySubscription.xml          |   12 -
 .../durablePR/durableFailoverR2.xml             |  256 --
 .../durablePR/durableNonDurableCrash.xml        |  264 --
 .../durablePR/durableNonDurableKAFalse.xml      |  229 --
 .../durablePR/durableNonDurableKATrue.xml       |  232 --
 .../durablePR/durableNonDurableTimeout.xml      |  233 --
 .../DurableClient/durablePerfEventCount.xml     |  136 -
 .../durablePerfPutGetThroughput.xml             |  122 -
 .../DurableClient/durablePerfVariableTest.xml   |  128 -
 .../DurableClient/durablePerfVariableTest2.xml  |  211 --
 .../durablePerfVariableTestWithHLRU.xml         |  212 --
 .../FESingleHopNonOptimized.xml                 |  140 -
 .../FunctionExecution/FESingleHopOptimized.xml  |  140 -
 .../FunctionExecution/csEmptyDataPolicy.xml     |   25 -
 .../FunctionExecution/csPartitionRegion.xml     |   25 -
 .../csPartitionRegionForFEHA.xml                |   17 -
 .../FunctionExecution/csReplicatedPR.xml        |   23 -
 .../FunctionExecution/csReplicatedRegion.xml    |   25 -
 .../FunctionExecution/exceptionHandling.xml     |  151 -
 .../FunctionExecution/functionExecutionHA.xml   |  122 -
 .../onRegionFunctionExecHAWithResult.xml        |  124 -
 .../onRegionFunctionExecWithOutResult.xml       |  108 -
 .../onRegionFunctionExecWithResult.xml          |  108 -
 .../onServerFunctionExecWithOutResult.xml       |  107 -
 .../onServerFunctionExecWithResult.xml          |  107 -
 .../onServersFunctionExecWithOutResult.xml      |  107 -
 .../onServersFunctionExecWithResult.xml         |  107 -
 .../replicatedRegionExecution.xml               |  109 -
 .../CyberTraderInterestListUpdateTest.xml       |  103 -
 .../Native/CyberTraderPerfVariableIntTest2.xml  |  107 -
 .../Native/CyberTraderPerfVariableTest.xml      |  125 -
 .../Native/CyberTraderPerfVariableTest2.xml     |  196 --
 .../CyberTraderPerfVariableTestIntWithHLRU.xml  |  104 -
 .../CyberTraderPerfVariableTestWithHLRU.xml     |  197 --
 .../cpp/xml/Generics/Native/clientEvents.xml    |  107 -
 .../Generics/Native/clientEventsFailover.xml    |  163 -
 .../clientQConflationNoServerConflation.xml     |  172 -
 ...entQConflationNoServerConflationFailover.xml |  230 --
 .../clientQConflationServerConflation.xml       |  172 -
 ...lientQConflationServerConflationFailover.xml |  246 --
 .../Generics/Native/clientScalabilityTest.xml   |  146 -
 .../cpp/xml/Generics/Native/csAckMirror.xml     |   10 -
 .../xml/Generics/Native/csAckMirrorConflate.xml |   17 -
 .../Generics/Native/csAckMirrorNoConflate.xml   |   17 -
 .../xml/Generics/Native/csAckMirrorQsize.xml    |   10 -
 .../xml/Generics/Native/csAckMirrorSecurity.xml |   10 -
 .../Native/csConflationNotifySubscription.xml   |   14 -
 src/tests/cpp/xml/Generics/Native/csHlru.xml    |   14 -
 src/tests/cpp/xml/Generics/Native/csMirror.xml  |   11 -
 .../cpp/xml/Generics/Native/csMultiRegion.xml   |   15 -
 .../csNoNotifyBySubscriptionServerCache.xml     |   12 -
 .../csNotifyBySubscriptionServerCache.xml       |   12 -
 .../Generics/Native/csNotifySubscription.xml    |   14 -
 .../xml/Generics/Native/csServerEviction.xml    |   14 -
 .../Generics/Native/csServerOverflowToDisk.xml  |   14 -
 .../cpp/xml/Generics/Native/failoverTest.xml    |  118 -
 .../cpp/xml/Generics/Native/getAllTest.xml      |  158 -
 .../xml/Generics/Native/perfBenchmarkTCR.xml    |  207 --
 .../Generics/Native/perfClientsUpdateTest.xml   |   97 -
 .../Native/perfCyberTraderLatencyPut.xml        |  123 -
 .../Native/perfCyberTraderPutGetThroughput.xml  |  112 -
 .../Generics/Native/perfTCROverflowToDisk.xml   |  113 -
 .../Generics/Native/perfTCRServerEviction.xml   |  111 -
 .../Native/perfTestPutGetDestroyTCR.xml         |  122 -
 .../Native/perfTestPutGetDestroyTCRscaledUp.xml |  162 -
 .../perfTestPutGetDestroy_FullInterestTCR.xml   |  141 -
 ...perfTestPutGetDestroy_PartialInterestTCR.xml |  142 -
 .../cpp/xml/Generics/Native/putGetAllTest.xml   |  156 -
 .../Generics/Native/regexTestWithFailover.xml   |  185 -
 .../Native/registerAllKeysGIIValueTest.xml      |  180 -
 .../xml/Generics/Native/registerAllKeysTest.xml |  140 -
 .../Native/registerAndUnregisterRegexTest.xml   |  122 -
 .../Native/registerKeysAndRegexTest.xml         |  153 -
 .../registerKeysAndRegexWithReceiveValue.xml    |  285 --
 src/tests/cpp/xml/Generics/Native/ticket226.xml |   66 -
 .../clientEventsHAFailover_FullInterest.xml     |  168 -
 .../clientEventsHAFailover_PartialInterest.xml  |  171 -
 .../cpp/xml/Generics/NativeHA/csAckMirror.xml   |   14 -
 .../cpp/xml/Generics/NativeHA/csNackMirror.xml  |   14 -
 .../NativeHA/failoverTestHARedundancyMet.xml    |  138 -
 .../NativeHA/failoverTestHARedundancyNotMet.xml |  136 -
 .../Generics/NativeHA/mixedRedundancyTestHA.xml |  146 -
 ...TestPutGetDestroy_FullInterestTCRHA_S2R1.xml |  175 -
 ...TestPutGetDestroy_FullInterestTCRHA_S3R2.xml |  156 -
 ...TestPutGetDestroy_FullInterestTCRHA_S3R3.xml |  156 -
 ...tPutGetDestroy_PartialInterestTCRHA_S2R1.xml |  145 -
 ...tPutGetDestroy_PartialInterestTCRHA_S3R2.xml |  156 -
 ...tPutGetDestroy_PartialInterestTCRHA_S3R3.xml |  156 -
 .../CyberTraderInterestListUpdateTest.xml       |  149 -
 .../CyberTraderPerfVariableIntTest2.xml         |   99 -
 .../NativePR/CyberTraderPerfVariableTest.xml    |  179 -
 .../NativePR/CyberTraderPerfVariableTest2.xml   |  202 --
 .../Generics/NativePR/clientEventsFailover.xml  |  167 -
 .../NativePR/csConflationNotifySubscription.xml |   12 -
 .../Generics/NativePR/csNotifySubscription.xml  |   12 -
 .../NativePR/csNotifySubscriptionSecurity.xml   |   12 -
 .../xml/Generics/NativePR/distributionCheck.xml |  130 -
 .../cpp/xml/Generics/NativePR/failoverTest.xml  |  182 -
 .../xml/Generics/NativePR/perfBenchmarkTCR.xml  |  262 --
 .../Generics/NativePR/perfClientsUpdateTest.xml |  142 -
 .../NativePR/perfCyberTraderLatencyPut.xml      |  169 -
 .../perfCyberTraderPutGetThroughput.xml         |  157 -
 .../NativePR/perfTestPutGetDestroyTCR.xml       |  177 -
 .../perfTestPutGetDestroyTCRscaledUp.xml        |  191 --
 .../perfTestPutGetDestroy_FullInterestTCR.xml   |  188 --
 ...perfTestPutGetDestroy_PartialInterestTCR.xml |  187 --
 .../clientEventsFailoverQueryTest.xml           |  207 --
 .../RemoteQuery/clientEventsQueryTest.xml       |  149 -
 .../xml/Generics/RemoteQuery/csAckMirror.xml    |  115 -
 .../RemoteQuery/csNotifySubscription.xml        |   71 -
 .../Generics/RemoteQuery/csServerEviction.xml   |   71 -
 .../RemoteQuery/csServerOverflowToDisk.xml      |   71 -
 .../xml/Generics/RemoteQuery/csWithIndex.xml    |   95 -
 .../RemoteQuery/dataValidationQueryTest.xml     |  144 -
 .../distributedDataValidationQueryTest.xml      |  150 -
 .../RemoteQuery/entryOperationQueryTest.xml     |  122 -
 .../Generics/RemoteQuery/failoverQueryTest.xml  |  149 -
 .../Generics/RemoteQuery/regexAndQueryTest.xml  |  128 -
 .../RemoteQuery/serverEvictionQueryTest.xml     |   85 -
 .../serverOverflowToDiskQueryTest.xml           |  121 -
 .../clientEventsFailoverQueryTest.xml           |  209 --
 .../RemoteQueryPR/clientEventsQueryTest.xml     |  142 -
 .../xml/Generics/RemoteQueryPR/csAckMirror.xml  |   86 -
 .../RemoteQueryPR/csNotifySubscription.xml      |   69 -
 .../Generics/RemoteQueryPR/csServerEviction.xml |   69 -
 .../xml/Generics/RemoteQueryPR/csWithIndex.xml  |   97 -
 .../Generics/RemoteQueryPR/csWithIndexRC2.xml   |   98 -
 .../RemoteQueryPR/csWithOutIndexRC2.xml         |   91 -
 .../RemoteQueryPR/dataValidationQueryTest.xml   |  141 -
 .../distributedDataValidationQueryTest.xml      |  147 -
 .../RemoteQueryPR/entryOperationQueryTest.xml   |  122 -
 .../RemoteQueryPR/failoverQueryTest.xml         |  224 --
 .../RemoteQueryPR/regexAndQueryTest.xml         |  127 -
 .../RemoteQueryPR/serverEvictionQueryTest.xml   |   96 -
 .../cpp/xml/Generics/ResumableTx/basicTx.xml    |   81 -
 .../xml/Generics/ResumableTx/concPRFailover.xml |  183 -
 .../xml/Generics/ResumableTx/concPRWithOps.xml  |  155 -
 .../xml/Generics/ResumableTx/concRRFailover.xml |  183 -
 .../xml/Generics/ResumableTx/concRRWithOps.xml  |  156 -
 .../cpp/xml/Generics/ResumableTx/csPRTx.xml     |   16 -
 src/tests/cpp/xml/Generics/ResumableTx/csTx.xml |   11 -
 .../xml/Generics/ResumableTx/resumableTx.list   |    6 -
 .../Generics/ResumableTx/serialPRFailover.xml   |  169 -
 .../Generics/ResumableTx/serialPRWithOps.xml    |  119 -
 .../Generics/ResumableTx/serialRRFailover.xml   |  171 -
 .../Generics/ResumableTx/serialRRWithOps.xml    |  119 -
 .../Native/clientAuthnAndAuthzFailoverTest.xml  |  274 --
 .../Security/Native/clientAuthnAndAuthzTest.xml |  227 --
 .../clientAuthnAndAuthzTestFailoverMU.xml       |  176 -
 .../Native/clientAuthnAndAuthzTestMU.xml        |  100 -
 .../Generics/Security/Native/csAckMirror.xml    |   10 -
 .../Security/Native/csAckMirrorSecurity.xml     |   18 -
 .../Native/csConflationNotifySubscription.xml   |   14 -
 .../cpp/xml/Generics/Security/Native/csHlru.xml |   14 -
 .../xml/Generics/Security/Native/csMirror.xml   |   11 -
 .../Security/Native/csNotifySubscription.xml    |   14 -
 .../Security/Native/csServerEviction.xml        |   14 -
 .../Security/Native/csServerOverflowToDisk.xml  |   14 -
 .../Security/Native/multiUserDurableCQ.xml      |  121 -
 .../clientAuthnAndAuthzFailoverPrMU.xml         |  164 -
 .../clientAuthnAndAuthzFailoverPrTest.xml       |  269 --
 .../NativePR/clientAuthnAndAuthzPrMU.xml        |  102 -
 .../NativePR/clientAuthnAndAuthzPrTest.xml      |  222 --
 .../NativePR/csConflationNotifySubscription.xml |   12 -
 .../Security/NativePR/csNotifySubscription.xml  |   12 -
 .../NativePR/csNotifySubscriptionSecurity.xml   |   20 -
 .../cpp/xml/Generics/Security/authz-dummy.xml   |   71 -
 .../cpp/xml/Generics/Security/authz-dummyMU.xml |   70 -
 .../cpp/xml/Generics/Security/authz-ldap.xml    |   68 -
 .../cpp/xml/Generics/Security/authz-pkcs.xml    |   68 -
 .../cpp/xml/Generics/Security/authz5_5.dtd      |   89 -
 .../Security/cacheserver/csClientEvents.xml     |   78 -
 .../Security/cacheserver/csOverflow.xml         |   39 -
 .../cpp/xml/Generics/Security/csAckMirror.xml   |   10 -
 src/tests/cpp/xml/Generics/cq.list              |   15 -
 src/tests/cpp/xml/Generics/cstx.list            |   16 -
 src/tests/cpp/xml/Generics/delta.list           |    6 -
 src/tests/cpp/xml/Generics/durableCSharp.list   |    8 -
 .../xml/Generics/functionExecutionCsharp.list   |   12 -
 src/tests/cpp/xml/Generics/hct/csAckMirror.xml  |   10 -
 .../hct/staticInterestPolicyAllKeys.xml         |  132 -
 .../hct/staticInterestPolicyAllKeysLateOps.xml  |  137 -
 .../Generics/hct/staticInterestPolicyList.xml   |  132 -
 .../hct/staticInterestPolicyListLateOps.xml     |  138 -
 .../Generics/hct/staticInterestPolicySingle.xml |  126 -
 .../hct/staticInterestPolicySingleLateOps.xml   |  138 -
 src/tests/cpp/xml/Generics/nativeNightly.list   |   17 -
 src/tests/cpp/xml/Generics/nativeNightlyHA.list |   10 -
 src/tests/cpp/xml/Generics/nativePR.list        |    7 -
 .../Generics/parReg/pdx/CqQuery/csAckMirror.xml |   43 -
 .../parReg/pdx/CqQuery/durableCqFailoverR2.xml  |  208 --
 .../parReg/pdx/CqQuery/durableTimeoutWithCq.xml |  147 -
 .../parReg/pdx/CqQuery/durableWithCqKAFalse.xml |  148 -
 .../parReg/pdx/CqQuery/durableWithCqKATrue.xml  |  148 -
 .../parReg/pdx/CqQuery/multRegCQOps.xml         |  127 -
 .../CqQuery/multRegServerFailoverAndCQOps.xml   |  157 -
 .../pdx/CqQuery/resultSetValidationCQTest.xml   |  140 -
 .../parReg/pdx/CqQuery/serialEntryEvent.xml     |  216 --
 .../serialMultRegOpsCQListenerWithFeeder.xml    |  233 --
 .../pdx/CqQuery/serverFailoverAndCQOps.xml      |  149 -
 .../parReg/pdx/CqQuery/singleRegCQOps.xml       |  120 -
 .../parReg/pdx/Pdx/concAutoSerializer.xml       |  142 -
 .../Generics/parReg/pdx/Pdx/csPRPdxFERegion.xml |   16 -
 .../parReg/pdx/Pdx/csPartitionRegion.xml        |   12 -
 .../Generics/parReg/pdx/Pdx/csPdxInstance.xml   |   13 -
 .../Generics/parReg/pdx/Pdx/csPersistentRgn.xml |   14 -
 .../parReg/pdx/Pdx/csReplicatedPdxRegion.xml    |   16 -
 .../xml/Generics/parReg/pdx/Pdx/pdxFailover.xml |  170 -
 .../parReg/pdx/Pdx/pdxInstanceFactoryTest.xml   |  144 -
 .../Generics/parReg/pdx/Pdx/pdxPRRegionFE.xml   |  124 -
 .../Generics/parReg/pdx/Pdx/pdxPRRegionOps.xml  |  113 -
 .../parReg/pdx/Pdx/pdxPersistentRegionFE.xml    |  122 -
 .../parReg/pdx/Pdx/pdxPutGetFEMerge.xml         |  191 --
 .../Generics/parReg/pdx/Pdx/pdxPutGetMerge.xml  |  174 -
 .../parReg/pdx/Pdx/pdxPutGetMergeWithRI.xml     |  177 -
 .../parReg/pdx/Pdx/pdxPutGetPdxInstance.xml     |  135 -
 .../parReg/pdx/Pdx/pdxReplicatedRegionFE.xml    |  137 -
 .../parReg/pdx/Pdx/pdxReplicatedRegionRI.xml    |  153 -
 .../parReg/pdx/Pdx/serialAutoSerializer.xml     |  135 -
 .../parReg/pdx/Pdx/serialNestedPdxOps.xml       |  135 -
 .../parReg/pdx/Pdx/serialParRegBridgePdx.xml    |  137 -
 .../clientEventsFailoverQueryTest.xml           |  206 --
 .../pdx/RemoteQuery/clientEventsQueryTest.xml   |  148 -
 .../parReg/pdx/RemoteQuery/csAckMirror.xml      |   43 -
 .../pdx/RemoteQuery/csNotifySubscription.xml    |   14 -
 .../Generics/parReg/pdx/RemoteQuery/csPR.xml    |   14 -
 .../parReg/pdx/RemoteQuery/csServerEviction.xml |   15 -
 .../pdx/RemoteQuery/csServerOverflowToDisk.xml  |   16 -
 .../parReg/pdx/RemoteQuery/csWithIndex.xml      |   35 -
 .../pdx/RemoteQuery/dataValidationQueryTest.xml |  144 -
 .../distributedDataValidationQueryTest.xml      |  150 -
 .../pdx/RemoteQuery/entryOperationQueryTest.xml |  122 -
 .../pdx/RemoteQuery/failoverQueryTest.xml       |  146 -
 .../pdx/RemoteQuery/regexAndQueryTest.xml       |  128 -
 .../pdx/RemoteQuery/serverEvictionQueryTest.xml |   85 -
 .../serverOverflowToDiskQueryTest.xml           |  121 -
 .../clientEventsFailoverQueryTest.xml           |  208 --
 .../pdx/RemoteQueryPR/clientEventsQueryTest.xml |  141 -
 .../parReg/pdx/RemoteQueryPR/csAckMirror.xml    |   29 -
 .../pdx/RemoteQueryPR/csNotifySubscription.xml  |   13 -
 .../pdx/RemoteQueryPR/csServerEviction.xml      |   69 -
 .../parReg/pdx/RemoteQueryPR/csWithIndex.xml    |   41 -
 .../parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml |   42 -
 .../pdx/RemoteQueryPR/csWithOutIndexRC2.xml     |   35 -
 .../RemoteQueryPR/dataValidationQueryTest.xml   |  141 -
 .../distributedDataValidationQueryTest.xml      |  147 -
 .../RemoteQueryPR/entryOperationQueryTest.xml   |  122 -
 .../pdx/RemoteQueryPR/failoverQueryTest.xml     |  221 --
 .../pdx/RemoteQueryPR/regexAndQueryTest.xml     |  127 -
 .../RemoteQueryPR/serverEvictionQueryTest.xml   |   96 -
 .../Generics/parReg/pdx/tx/serialEntryEvent.xml |  209 --
 .../parReg/pdx/tx/serialEntryEventPR.xml        |  209 --
 .../parReg/pdx/tx/serverFailoverAndCQOps.xml    |  150 -
 .../Generics/parReg/pdx/tx/singleRegCQOps.xml   |  120 -
 .../parReg/subscription/csAckMirror.xml         |   12 -
 .../Generics/parReg/subscription/csPRegion.xml  |   12 -
 .../staticInterestPolicyAllKeys.xml             |  132 -
 .../staticInterestPolicyAllKeysLateOps.xml      |  137 -
 .../subscription/staticInterestPolicyList.xml   |  132 -
 .../staticInterestPolicyListLateOps.xml         |  138 -
 .../subscription/staticInterestPolicySingle.xml |  126 -
 .../staticInterestPolicySingleLateOps.xml       |  138 -
 .../Generics/parReg/tx/colocatedTxBridge.xml    |  128 -
 .../xml/Generics/parReg/tx/conParRegBridge.xml  |  142 -
 .../xml/Generics/parReg/tx/conParRegBridge1.xml |  129 -
 .../xml/Generics/parReg/tx/conParRegBridge2.xml |  129 -
 .../parReg/tx/conParRegBridgeRRRedundency2.xml  |  216 --
 .../parReg/tx/conParRegBridgeRedundency1.xml    |  201 --
 .../parReg/tx/conParRegBridgeRedundency2.xml    |  216 --
 .../parReg/tx/conParRegBridgeRedundency3.xml    |  216 --
 .../Generics/parReg/tx/concDeltaPRBridge.xml    |  123 -
 .../parReg/tx/concDeltaReplicateBridge.xml      |  149 -
 .../cpp/xml/Generics/parReg/tx/csAckMirror.xml  |   10 -
 src/tests/cpp/xml/Generics/parReg/tx/csPR.xml   |   14 -
 .../xml/Generics/parReg/tx/csPRRedundency1.xml  |   12 -
 .../xml/Generics/parReg/tx/csPRRedundency2.xml  |   12 -
 .../xml/Generics/parReg/tx/csPRRedundency3.xml  |   12 -
 .../Generics/parReg/tx/csPartitionRegion.xml    |   25 -
 .../parReg/tx/csPartitionRegionColo.xml         |   32 -
 .../Generics/parReg/tx/csReplicateRegion.xml    |   12 -
 .../Generics/parReg/tx/functionExecutionHA.xml  |  121 -
 .../tx/onRegionFunctionExecWithOutResult.xml    |  108 -
 .../tx/onRegionFunctionExecWithResult.xml       |  108 -
 .../parReg/tx/replicatedRegionExecution.xml     |  109 -
 .../xml/Generics/parReg/tx/serialEntryEvent.xml |  209 --
 .../Generics/parReg/tx/serialEntryEventPR.xml   |  209 --
 .../tx/serialEntryEventPRWithRegInterest.xml    |  216 --
 .../tx/serialEntryEventWithRegInterest.xml      |  216 --
 .../Generics/parReg/tx/serialParRegBridge.xml   |  138 -
 .../Generics/parReg/tx/serialParRegBridge1.xml  |  125 -
 .../Generics/parReg/tx/serialParRegBridge2.xml  |  125 -
 .../parReg/tx/serverFailoverAndCQOps.xml        |  150 -
 .../xml/Generics/parReg/tx/singleRegCQOps.xml   |  120 -
 .../parReg/tx/staticInterestPolicyAllKeys.xml   |  133 -
 .../tx/staticInterestPolicyAllKeysLateOps.xml   |  138 -
 .../parReg/tx/staticInterestPolicyList.xml      |  133 -
 .../tx/staticInterestPolicyListLateOps.xml      |  139 -
 .../parReg/tx/staticInterestPolicySingle.xml    |  127 -
 .../tx/staticInterestPolicySingleLateOps.xml    |  140 -
 src/tests/cpp/xml/Generics/pdx.list             |   32 -
 src/tests/cpp/xml/Generics/pdxNtx.list          |   23 -
 src/tests/cpp/xml/Generics/perf.list            |   43 -
 .../cpp/xml/Generics/remoteQueryNightly.list    |   10 -
 .../cpp/xml/Generics/remoteQueryNightlyPR.list  |    8 -
 src/tests/cpp/xml/Generics/scale.list           |   36 -
 src/tests/cpp/xml/Generics/securityNightly.list |    9 -
 .../xml/Generics/smoketest/perf/getobject.xml   |  116 -
 .../cpp/xml/Generics/smoketest/perf/perf016.xml |  112 -
 .../cpp/xml/Generics/smoketest/perf/perf017.xml |  111 -
 .../cpp/xml/Generics/smoketest/perf/perf061.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf062.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf063.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf064.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf065.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf067.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf068.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf069.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf070.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf071.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf073.xml |   63 -
 .../cpp/xml/Generics/smoketest/perf/perf074.xml |   59 -
 .../cpp/xml/Generics/smoketest/perf/perf075.xml |   65 -
 .../cpp/xml/Generics/smoketest/perf/perf077.xml |  118 -
 .../cpp/xml/Generics/smoketest/perf/perf078.xml |  118 -
 .../cpp/xml/Generics/smoketest/perf/perf079.xml |  116 -
 .../cpp/xml/Generics/smoketest/perf/perf082.xml |  110 -
 .../cpp/xml/Generics/smoketest/perf/perf083.xml |  110 -
 .../cpp/xml/Generics/smoketest/perf/perf090.xml |  118 -
 .../cpp/xml/Generics/smoketest/perf/perf091.xml |  118 -
 .../cpp/xml/Generics/smoketest/perf/perf092.xml |  115 -
 .../cpp/xml/Generics/smoketest/perf/perf096.xml |   92 -
 .../cpp/xml/Generics/smoketest/perf/perf097.xml |   92 -
 .../cpp/xml/Generics/smoketest/perf/perf098.xml |  121 -
 .../cpp/xml/Generics/smoketest/perf/perf100.xml |   94 -
 .../cpp/xml/Generics/smoketest/perf/perf102.xml |   60 -
 .../cpp/xml/Generics/smoketest/perf/perf103.xml |   59 -
 .../cpp/xml/Generics/smoketest/perf/perf104.xml |   59 -
 .../cpp/xml/Generics/smoketest/perf/perf105.xml |   59 -
 .../cpp/xml/Generics/smoketest/perf/perf106.xml |   84 -
 .../cpp/xml/Generics/smoketest/perf/perf107.xml |   84 -
 .../cpp/xml/Generics/smoketest/perf/perf108.xml |   84 -
 .../cpp/xml/Generics/smoketest/perf/perf109.xml |   84 -
 .../cpp/xml/Generics/smoketest/perf/perf110.xml |   81 -
 .../cpp/xml/Generics/smoketest/perf/perf111.xml |   79 -
 .../cpp/xml/Generics/smoketest/perf/perf112.xml |   97 -
 .../cpp/xml/Generics/smoketest/perf/perf113.xml |  120 -
 .../cpp/xml/Generics/smoketest/perf/perf114.xml |  115 -
 .../cpp/xml/Generics/smoketest/perf/perf115.xml |  115 -
 .../cpp/xml/Generics/smoketest/perf/perf148.xml |  114 -
 .../cpp/xml/Generics/smoketest/perf/perf149.xml |  112 -
 .../cpp/xml/Generics/smoketest/perf/perf150.xml |  132 -
 .../cpp/xml/Generics/smoketest/perf/perf152.xml |  111 -
 .../cpp/xml/Generics/smoketest/perf/perf153.xml |  133 -
 .../cpp/xml/Generics/smoketest/perf/perf154.xml |  133 -
 .../xml/Generics/smoketest/scale/scale047.xml   |  134 -
 .../xml/Generics/smoketest/scale/scale048.xml   |  137 -
 .../xml/Generics/smoketest/scale/scale049.xml   |  136 -
 .../xml/Generics/smoketest/scale/scale050.xml   |  140 -
 .../xml/Generics/smoketest/scale/scale051.xml   |  131 -
 .../xml/Generics/smoketest/scale/scale052.xml   |  139 -
 .../xml/Generics/smoketest/scale/scale053.xml   |  136 -
 .../xml/Generics/smoketest/scale/scale054.xml   |  137 -
 .../xml/Generics/smoketest/scale/scale055.xml   |  136 -
 .../xml/Generics/smoketest/scale/scale056.xml   |  138 -
 .../xml/Generics/smoketest/scale/scale057.xml   |  138 -
 .../xml/Generics/smoketest/scale/scale058.xml   |  133 -
 .../xml/Generics/smoketest/scale/scale059.xml   |  138 -
 .../xml/Generics/smoketest/scale/scale060.xml   |  138 -
 .../xml/Generics/smoketest/scale/scale061.xml   |  136 -
 .../xml/Generics/smoketest/scale/scale062.xml   |  140 -
 .../xml/Generics/smoketest/scale/scale063.xml   |  136 -
 .../xml/Generics/smoketest/scale/scale064.xml   |  139 -
 .../xml/Generics/smoketest/scale/scale065.xml   |  139 -
 .../xml/Generics/smoketest/scale/scale066.xml   |  137 -
 .../xml/Generics/smoketest/scale/scale071.xml   |  149 -
 .../xml/Generics/smoketest/scale/scale072.xml   |  149 -
 .../xml/Generics/smoketest/scale/scale073.xml   |  152 -
 .../xml/Generics/smoketest/scale/scale074.xml   |  146 -
 .../xml/Generics/smoketest/scale/scale075.xml   |  149 -
 .../xml/Generics/smoketest/scale/scale076.xml   |  150 -
 .../xml/Generics/smoketest/scale/scale077.xml   |  147 -
 .../xml/Generics/smoketest/scale/scale078.xml   |  151 -
 .../xml/Generics/smoketest/scale/scale079.xml   |  150 -
 .../xml/Generics/smoketest/scale/scale080.xml   |  151 -
 .../xml/Generics/smoketest/scale/scale081.xml   |  146 -
 .../xml/Generics/smoketest/scale/scale082.xml   |  150 -
 .../xml/Generics/smoketest/scale/scale083.xml   |  153 -
 .../xml/Generics/smoketest/scale/scale084.xml   |  150 -
 .../xml/Generics/smoketest/scale/scale085.xml   |  154 -
 .../xml/Generics/smoketest/scale/scale086.xml   |  154 -
 src/tests/cpp/xml/Generics/subscription.list    |   18 -
 src/tests/cpp/xml/Mcast/entryEvent.xml          |  149 -
 src/tests/cpp/xml/Mcast/entryEventLong.xml      |  179 -
 src/tests/cpp/xml/Mcast/largeMembership.xml     |  107 -
 src/tests/cpp/xml/Mcast/mirrorGII.xml           |   52 -
 src/tests/cpp/xml/Mcast/netSearch.xml           |   97 -
 src/tests/cpp/xml/Mcast/perfBenchmark.xml       |  153 -
 src/tests/cpp/xml/Mcast/regionContentTest.xml   |  143 -
 src/tests/cpp/xml/Mcast/regionEventMT.xml       |  166 -
 .../cpp/xml/Misc/Deprecated/dsMemberCount.xml   |   47 -
 .../cpp/xml/Misc/VerifyPeerRegionCount.xml      |   26 -
 src/tests/cpp/xml/Misc/cacheContentTest.xml     |  124 -
 src/tests/cpp/xml/Misc/getInitialImage.xml      |   67 -
 src/tests/cpp/xml/Misc/memoryMeasurement.xml    |  174 -
 src/tests/cpp/xml/Misc/quickTest.xml            |   85 -
 src/tests/cpp/xml/Misc/rawLBM.xml               |   45 -
 src/tests/cpp/xml/Misc/regionContentTest.xml    |  143 -
 src/tests/cpp/xml/Misc/regionMemory.xml         | 3174 ------------------
 src/tests/cpp/xml/Misc/sampleJavaCS.xml         |   43 -
 src/tests/cpp/xml/Misc/smallMembership.xml      |   20 -
 .../CyberTraderInterestListUpdateTest.xml       |  209 --
 src/tests/cpp/xml/MixedMode/bridge_client.xml   |   38 -
 .../xml/MixedMode/bridge_client_cacheless.xml   |   38 -
 .../cpp/xml/MixedMode/clientUserObject.xml      |  189 --
 .../cpp/xml/MixedMode/clientUserObjectKey.xml   |  164 -
 src/tests/cpp/xml/MixedMode/csAckMirror.xml     |   23 -
 .../cpp/xml/MixedMode/perfBenchmarkTCR.xml      |  425 ---
 .../clientEventsFailoverQueryTest.xml           |  250 --
 .../clientEventsFailoverQueryTest_CS.xml        |  113 -
 .../xml/MixedModeCS/clientEventsQueryTest.xml   |  208 --
 .../MixedModeCS/clientEventsQueryTest_CS.xml    |   95 -
 src/tests/cpp/xml/MixedModeCS/failoverTest.xml  |  139 -
 .../cpp/xml/MixedModeCS/failoverTest_CS.xml     |   91 -
 .../xml/MixedModeCS/interopDataValidation.xml   |   98 -
 .../MixedModeCS/interopDataValidation_CS.xml    |   75 -
 .../cpp/xml/MixedModeCS/interopWithFailover.xml |  169 -
 .../xml/MixedModeCS/interopWithFailover_CS.xml  |   83 -
 .../cpp/xml/MixedModeCS/throughPuts32K.xml      |  339 --
 .../cpp/xml/MixedModeCS/throughPuts32K_CS.xml   |  195 --
 .../CyberTraderInterestListUpdateTest.xml       |  104 -
 .../xml/Native/CyberTraderPerfVariableTest.xml  |  118 -
 .../xml/Native/CyberTraderPerfVariableTest2.xml |  201 --
 .../CyberTraderPerfVariableTestWithHLRU.xml     |  212 --
 src/tests/cpp/xml/Native/clientEvents.xml       |  107 -
 .../cpp/xml/Native/clientEventsFailover.xml     |  163 -
 .../cpp/xml/Native/clientEventsFailoverCB.xml   |  344 --
 .../xml/Native/clientEventsFailoverSticky.xml   |  176 -
 src/tests/cpp/xml/Native/clientEventsHLRU.xml   |   61 -
 .../cpp/xml/Native/clientPayloadScalability.xml |  167 -
 .../clientQConflationNoServerConflation.xml     |  172 -
 ...entQConflationNoServerConflationFailover.xml |  230 --
 .../clientQConflationServerConflation.xml       |  172 -
 ...lientQConflationServerConflationFailover.xml |  246 --
 .../Native/clientScalabilityMultiServerTest.xml |  158 -
 .../cpp/xml/Native/clientScalabilityTest.xml    |  146 -
 src/tests/cpp/xml/Native/conflationTest.xml     |  141 -
 src/tests/cpp/xml/Native/csAckMirror.xml        |   10 -
 .../cpp/xml/Native/csAckMirrorConflate.xml      |   17 -
 .../cpp/xml/Native/csAckMirrorNoConflate.xml    |   17 -
 src/tests/cpp/xml/Native/csAckMirrorQsize.xml   |   10 -
 .../cpp/xml/Native/csAckMirrorSecurity.xml      |   10 -
 .../Native/csConflationNotifySubscription.xml   |   14 -
 src/tests/cpp/xml/Native/csHlru.xml             |   14 -
 src/tests/cpp/xml/Native/csMirror.xml           |   11 -
 src/tests/cpp/xml/Native/csMultiRegion.xml      |   15 -
 .../csNoNotifyBySubscriptionServerCache.xml     |   12 -
 .../csNotifyBySubscriptionServerCache.xml       |   12 -
 .../cpp/xml/Native/csNotifySubscription.xml     |   14 -
 src/tests/cpp/xml/Native/csServerEviction.xml   |   14 -
 .../cpp/xml/Native/csServerOverflowToDisk.xml   |   14 -
 src/tests/cpp/xml/Native/failoverTest.xml       |  119 -
 src/tests/cpp/xml/Native/getAllTest.xml         |  157 -
 src/tests/cpp/xml/Native/perfBenchmarkTCR.xml   |  207 --
 .../cpp/xml/Native/perfClientsUpdateTest.xml    |   97 -
 .../xml/Native/perfCyberTraderLatencyPut.xml    |  123 -
 .../Native/perfCyberTraderPutGetThroughput.xml  |  112 -
 .../cpp/xml/Native/perfTCROverflowToDisk.xml    |  113 -
 .../cpp/xml/Native/perfTCRServerEviction.xml    |  111 -
 .../cpp/xml/Native/perfTestPutGetDestroyTCR.xml |  122 -
 .../Native/perfTestPutGetDestroyTCRscaledUp.xml |  162 -
 .../perfTestPutGetDestroy_FullInterestTCR.xml   |  141 -
 ...perfTestPutGetDestroy_PartialInterestTCR.xml |  142 -
 src/tests/cpp/xml/Native/putGetAllTest.xml      |  157 -
 .../cpp/xml/Native/regexTestWithFailover.xml    |  185 -
 .../xml/Native/registerAllKeysGIIValueTest.xml  |  180 -
 .../cpp/xml/Native/registerAllKeysTest.xml      |  140 -
 .../Native/registerAndUnregisterRegexTest.xml   |  122 -
 .../cpp/xml/Native/registerKeysAndRegexTest.xml |  164 -
 .../registerKeysAndRegexWithReceiveValue.xml    |  287 --
 src/tests/cpp/xml/Native/ticket226.xml          |   66 -
 src/tests/cpp/xml/Native/verifyKeyCountTest.xml |   92 -
 .../xml/Native/verifyKeyCountWithFailover.xml   |  120 -
 src/tests/cpp/xml/Native/vmMemory.xml           |  169 -
 .../CyberTraderInterestListUpdateTest.xml       |  110 -
 .../Native43/CyberTraderPerfVariableTest.xml    |  115 -
 .../Native43/CyberTraderPerfVariableTest2.xml   |  208 --
 src/tests/cpp/xml/Native43/clientEvents.xml     |   90 -
 .../cpp/xml/Native43/clientEventsFailover.xml   |  131 -
 .../clientScalabilityMultiServerTest.xml        |  118 -
 .../cpp/xml/Native43/clientScalabilityTest.xml  |  117 -
 src/tests/cpp/xml/Native43/conflationTest.xml   |  166 -
 src/tests/cpp/xml/Native43/csAckMirror.xml      |   11 -
 .../cpp/xml/Native43/csAckMirrorConflate.xml    |   11 -
 .../Native43/csConflationNotifySubscription.xml |   11 -
 .../cpp/xml/Native43/csNotifySubscription.xml   |   11 -
 src/tests/cpp/xml/Native43/csServerEviction.xml |   11 -
 .../cpp/xml/Native43/csServerOverflowToDisk.xml |   11 -
 src/tests/cpp/xml/Native43/failoverTest.xml     |   90 -
 src/tests/cpp/xml/Native43/mixedMode.xml        |   49 -
 src/tests/cpp/xml/Native43/perfBenchmarkTCR.xml |  201 --
 .../cpp/xml/Native43/perfClientsUpdateTest.xml  |   85 -
 .../xml/Native43/perfCyberTraderLatencyPut.xml  |  126 -
 .../perfCyberTraderPutGetThroughput.xml         |  113 -
 .../cpp/xml/Native43/perfTCROverflowToDisk.xml  |  129 -
 .../cpp/xml/Native43/perfTCRServerEviction.xml  |  127 -
 .../xml/Native43/perfTestPutGetDestroyTCR.xml   |  138 -
 .../perfTestPutGetDestroyTCRscaledUp.xml        |  223 --
 .../perfTestPutGetDestroy_FullInterestTCR.xml   |  178 -
 ...perfTestPutGetDestroy_PartialInterestTCR.xml |  178 -
 .../cpp/xml/Native43/registerAllKeysTest.xml    |  166 -
 .../cpp/xml/Native43/verifyKeyCountTest.xml     |   97 -
 .../xml/Native43/verifyKeyCountWithFailover.xml |   64 -
 .../clientEventsHAFailover_FullInterest.xml     |  168 -
 .../clientEventsHAFailover_PartialInterest.xml  |  171 -
 .../xml/NativeHA/clientPayloadScalability.xml   |  160 -
 src/tests/cpp/xml/NativeHA/csAckMirror.xml      |   14 -
 src/tests/cpp/xml/NativeHA/csNackMirror.xml     |   14 -
 .../xml/NativeHA/failoverTestHAEventIDMap.xml   |  154 -
 .../NativeHA/failoverTestHARedundancyMet.xml    |  138 -
 .../NativeHA/failoverTestHARedundancyNotMet.xml |  136 -
 src/tests/cpp/xml/NativeHA/latencyPuts10M.xml   |  233 --
 src/tests/cpp/xml/NativeHA/latencyPuts1K.xml    |  268 --
 src/tests/cpp/xml/NativeHA/latencyPuts32K.xml   |  268 --
 src/tests/cpp/xml/NativeHA/latencyPuts5M.xml    |  233 --
 src/tests/cpp/xml/NativeHA/latencyPuts8K.xml    |  233 --
 .../cpp/xml/NativeHA/mixedRedundancyTestHA.xml  |  146 -
 ...TestPutGetDestroy_FullInterestTCRHA_S2R1.xml |  175 -
 ...TestPutGetDestroy_FullInterestTCRHA_S3R2.xml |  156 -
 ...TestPutGetDestroy_FullInterestTCRHA_S3R3.xml |  156 -
 ...tPutGetDestroy_PartialInterestTCRHA_S2R1.xml |  145 -
 ...tPutGetDestroy_PartialInterestTCRHA_S3R2.xml |  156 -
 ...tPutGetDestroy_PartialInterestTCRHA_S3R3.xml |  156 -
 src/tests/cpp/xml/NativeHA/throughPuts10M.xml   |  214 --
 src/tests/cpp/xml/NativeHA/throughPuts1K.xml    |  249 --
 src/tests/cpp/xml/NativeHA/throughPuts32K.xml   |  249 --
 src/tests/cpp/xml/NativeHA/throughPuts5M.xml    |  214 --
 src/tests/cpp/xml/NativeHA/throughPuts8K.xml    |  214 --
 src/tests/cpp/xml/NativeMorgan/csAckMirror.xml  |   11 -
 src/tests/cpp/xml/NativeMorgan/csNackMirror.xml |   11 -
 .../cpp/xml/NativeMorgan43/csAckMirror.xml      |   11 -
 .../cpp/xml/NativeMorgan43/csNackMirror.xml     |   11 -
 .../CyberTraderInterestListUpdateTest.xml       |  149 -
 .../NativePR/CyberTraderPerfVariableTest.xml    |  172 -
 .../NativePR/CyberTraderPerfVariableTest2.xml   |  208 --
 src/tests/cpp/xml/NativePR/clientEvents.xml     |  130 -
 .../cpp/xml/NativePR/clientEventsFailover.xml   |  167 -
 .../xml/NativePR/clientPayloadScalability.xml   |  220 --
 .../clientScalabilityMultiServerTest.xml        |  176 -
 .../cpp/xml/NativePR/clientScalabilityTest.xml  |  174 -
 src/tests/cpp/xml/NativePR/conflationTest.xml   |  186 -
 .../NativePR/csConflationNotifySubscription.xml |   12 -
 .../cpp/xml/NativePR/csNotifySubscription.xml   |   12 -
 .../NativePR/csNotifySubscriptionSecurity.xml   |   12 -
 .../cpp/xml/NativePR/distributionCheck.xml      |  130 -
 src/tests/cpp/xml/NativePR/failoverTest.xml     |  182 -
 src/tests/cpp/xml/NativePR/perfBenchmarkTCR.xml |  262 --
 .../cpp/xml/NativePR/perfClientsUpdateTest.xml  |  142 -
 .../xml/NativePR/perfCyberTraderLatencyPut.xml  |  169 -
 .../perfCyberTraderPutGetThroughput.xml         |  157 -
 .../xml/NativePR/perfTestPutGetDestroyTCR.xml   |  177 -
 .../perfTestPutGetDestroyTCRscaledUp.xml        |  191 --
 .../perfTestPutGetDestroy_FullInterestTCR.xml   |  188 --
 ...perfTestPutGetDestroy_PartialInterestTCR.xml |  187 --
 .../cpp/xml/NativePR/regexTestWithFailover.xml  |  205 --
 .../cpp/xml/NativePR/registerAllKeysTest.xml    |  185 -
 .../NativePR/registerAndUnregisterRegexTest.xml |  167 -
 .../xml/NativePR/registerKeysAndRegexTest.xml   |  172 -
 .../cpp/xml/NativePR/verifyKeyCountTest.xml     |  137 -
 .../xml/NativePR/verifyKeyCountWithFailover.xml |  169 -
 .../NativePerf/MLticket8946perfBenchmark.xml    |   99 -
 src/tests/cpp/xml/NativePerf/csAckMirror.xml    |   10 -
 src/tests/cpp/xml/NativePerf/perfBenchmark.xml  |  170 -
 src/tests/cpp/xml/NativePerf/sockPerf.xml       |  191 --
 src/tests/cpp/xml/Regression/entryEvent.xml     |  126 -
 .../cpp/xml/Regression/entryEvent33Hour.xml     |  128 -
 .../cpp/xml/Regression/largeMembership.xml      |  199 --
 .../cpp/xml/Regression/latencyBenchmark.xml     |  219 --
 src/tests/cpp/xml/Regression/mirrorGII.xml      |   71 -
 src/tests/cpp/xml/Regression/perfBenchmark.xml  |  231 --
 src/tests/cpp/xml/Regression/regionContent.xml  |  267 --
 .../xml/Regression/regionEventLocalRoots.xml    |   46 -
 .../cpp/xml/Regression/regionEventRoots.xml     |  251 --
 .../cpp/xml/Regression/regionPeerCount.xml      |  215 --
 .../RemoteQuery/cacheScalabilityQueryTest.xml   |  206 --
 .../clientEventsFailoverQueryTest.xml           |  200 --
 .../xml/RemoteQuery/clientEventsQueryTest.xml   |  144 -
 .../clientScalabilityPayloadQueryTest.xml       |  252 --
 .../RemoteQuery/clientScalabilityQueryTest.xml  |  181 -
 src/tests/cpp/xml/RemoteQuery/concQuery.xml     |   80 -
 src/tests/cpp/xml/RemoteQuery/csAckMirror.xml   |  115 -
 .../xml/RemoteQuery/csNotifySubscription.xml    |   71 -
 .../cpp/xml/RemoteQuery/csServerEviction.xml    |   71 -
 .../xml/RemoteQuery/csServerOverflowToDisk.xml  |   71 -
 src/tests/cpp/xml/RemoteQuery/csWithIndex.xml   |   95 -
 .../xml/RemoteQuery/dataValidationQueryTest.xml |  143 -
 .../distributedDataValidationQueryTest.xml      |  149 -
 .../xml/RemoteQuery/entryOperationQueryTest.xml |  124 -
 .../cpp/xml/RemoteQuery/failoverQueryTest.xml   |  149 -
 .../RemoteQuery/globalEndPointExistenceTest.xml |  107 -
 .../multiServerClientScalabilityQueryTest.xml   |  253 --
 .../RemoteQuery/payloadScalabilityQueryTest.xml |  344 --
 .../cpp/xml/RemoteQuery/regexAndQueryTest.xml   |  128 -
 .../xml/RemoteQuery/serverEvictionQueryTest.xml |   85 -
 .../serverOverflowToDiskQueryTest.xml           |  121 -
 .../RemoteQueryPR/cacheScalabilityQueryTest.xml |  205 --
 .../clientEventsFailoverQueryTest.xml           |  209 --
 .../xml/RemoteQueryPR/clientEventsQueryTest.xml |  142 -
 .../clientScalabilityPayloadQueryTest.xml       |  251 --
 .../clientScalabilityQueryTest.xml              |  180 -
 src/tests/cpp/xml/RemoteQueryPR/csAckMirror.xml |   86 -
 .../xml/RemoteQueryPR/csNotifySubscription.xml  |   69 -
 .../cpp/xml/RemoteQueryPR/csServerEviction.xml  |   69 -
 src/tests/cpp/xml/RemoteQueryPR/csWithIndex.xml |   97 -
 .../cpp/xml/RemoteQueryPR/csWithIndexRC2.xml    |   98 -
 .../cpp/xml/RemoteQueryPR/csWithOutIndexRC2.xml |   91 -
 .../RemoteQueryPR/dataValidationQueryTest.xml   |  135 -
 .../distributedDataValidationQueryTest.xml      |  141 -
 .../RemoteQueryPR/entryOperationQueryTest.xml   |  124 -
 .../cpp/xml/RemoteQueryPR/failoverQueryTest.xml |  224 --
 .../globalEndPointExistenceTest.xml             |  106 -
 .../multiServerClientScalabilityQueryTest.xml   |  252 --
 .../payloadScalabilityQueryTest.xml             |  343 --
 .../cpp/xml/RemoteQueryPR/regexAndQueryTest.xml |  127 -
 .../RemoteQueryPR/serverEvictionQueryTest.xml   |   96 -
 src/tests/cpp/xml/RogueWave/latencyPuts2K.xml   |   52 -
 src/tests/cpp/xml/RogueWave/throughPuts2K.xml   |  120 -
 .../SSL/clientAuthenticationAuthorization.xml   |  178 -
 .../cpp/xml/SSL/clientAuthnAndAuthzTest.xml     |  249 --
 src/tests/cpp/xml/SSL/csAckMirror.xml           |   14 -
 .../xml/SSL/failoverTestHARedundancyNotMet.xml  |  139 -
 .../client500ScaleTestWithHAFailover.xml        |  261 --
 src/tests/cpp/xml/ScaleTest/csAckMirror.xml     |   14 -
 .../Native/clientAuthnAndAuthzFailoverTest.xml  |  273 --
 .../Security/Native/clientAuthnAndAuthzTest.xml |  227 --
 .../clientAuthnAndAuthzTestFailoverMU.xml       |  176 -
 .../Native/clientAuthnAndAuthzTestMU.xml        |  100 -
 .../cpp/xml/Security/Native/clientEvents.xml    |  201 --
 .../Security/Native/clientEventsFailover.xml    |  245 --
 .../xml/Security/Native/clientEventsHLRU.xml    |   74 -
 .../Native/clientPayloadScalability.xml         |  183 -
 .../cpp/xml/Security/Native/conflationTest.xml  |  174 -
 .../cpp/xml/Security/Native/csAckMirror.xml     |   10 -
 .../xml/Security/Native/csAckMirrorSecurity.xml |   18 -
 .../Native/csConflationNotifySubscription.xml   |   14 -
 src/tests/cpp/xml/Security/Native/csHlru.xml    |   14 -
 src/tests/cpp/xml/Security/Native/csMirror.xml  |   11 -
 .../Security/Native/csNotifySubscription.xml    |   14 -
 .../xml/Security/Native/csServerEviction.xml    |   14 -
 .../Security/Native/csServerOverflowToDisk.xml  |   14 -
 .../cpp/xml/Security/Native/failoverTest.xml    |  137 -
 .../xml/Security/Native/multiUserDurableCQ.xml  |  121 -
 .../Native/perfCyberTraderLatencyPut.xml        |  148 -
 .../Security/Native/perfTCROverflowToDisk.xml   |  161 -
 .../Security/Native/perfTCRServerEviction.xml   |  159 -
 .../Security/Native/regexTestWithFailover.xml   |  178 -
 .../Native/registerAndUnregisterRegexTest.xml   |  147 -
 .../clientEventsHAFailover_FullInterest.xml     |  241 --
 .../cpp/xml/Security/NativeHA/csAckMirror.xml   |   14 -
 .../cpp/xml/Security/NativeHA/csNackMirror.xml  |   14 -
 .../NativeHA/failoverTestHARedundancyNotMet.xml |  174 -
 .../cpp/xml/Security/NativeHA/latencyPuts8K.xml |  289 --
 .../Security/NativeHA/mixedRedundancyTestHA.xml |  168 -
 .../xml/Security/NativeMorgan/csAckMirror.xml   |   11 -
 .../xml/Security/NativeMorgan/csNackMirror.xml  |   11 -
 .../clientAuthnAndAuthzFailoverPrMU.xml         |  166 -
 .../clientAuthnAndAuthzFailoverPrTest.xml       |  274 --
 .../NativePR/clientAuthnAndAuthzPrMU.xml        |  104 -
 .../NativePR/clientAuthnAndAuthzPrTest.xml      |  227 --
 .../cpp/xml/Security/NativePR/clientEvents.xml  |  181 -
 .../Security/NativePR/clientEventsFailover.xml  |  232 --
 .../NativePR/clientPayloadScalability.xml       |  242 --
 .../Security/NativePR/clientScalabilityTest.xml |  242 --
 .../xml/Security/NativePR/conflationTest.xml    |  224 --
 .../NativePR/csConflationNotifySubscription.xml |   12 -
 .../Security/NativePR/csNotifySubscription.xml  |   12 -
 .../NativePR/csNotifySubscriptionSecurity.xml   |   20 -
 .../xml/Security/NativePR/distributionCheck.xml |  160 -
 .../cpp/xml/Security/NativePR/failoverTest.xml  |  210 --
 .../NativePR/perfCyberTraderLatencyPut.xml      |  199 --
 .../Security/NativePR/regexTestWithFailover.xml |  231 --
 .../NativePR/registerAndUnregisterRegexTest.xml |  187 --
 .../NativePerf/MLticket8946perfBenchmark.xml    |   99 -
 .../cpp/xml/Security/NativePerf/csAckMirror.xml |   10 -
 .../xml/Security/NativePerf/perfBenchmark.xml   |  170 -
 .../xml/Security/RemoteQuery/csAckMirror.xml    |  101 -
 .../RemoteQuery/csNotifySubscription.xml        |   71 -
 .../Security/RemoteQuery/csServerEviction.xml   |   71 -
 .../RemoteQuery/csServerOverflowToDisk.xml      |   71 -
 .../xml/Security/RemoteQuery/csWithIndex.xml    |   95 -
 .../xml/Security/RemoteQueryPR/csAckMirror.xml  |   86 -
 .../RemoteQueryPR/csNotifySubscription.xml      |   69 -
 .../Security/RemoteQueryPR/csServerEviction.xml |   69 -
 .../xml/Security/RemoteQueryPR/csWithIndex.xml  |   97 -
 .../Security/RemoteQueryPR/csWithIndexRC2.xml   |   98 -
 .../RemoteQueryPR/csWithOutIndexRC2.xml         |   91 -
 src/tests/cpp/xml/Security/authz-dummy.xml      |   72 -
 src/tests/cpp/xml/Security/authz-dummyMU.xml    |   71 -
 src/tests/cpp/xml/Security/authz-ldap.xml       |   69 -
 src/tests/cpp/xml/Security/authz-pkcs.xml       |   69 -
 src/tests/cpp/xml/Security/authz5_5.dtd         |   89 -
 .../xml/Security/cacheserver/csClientEvents.xml |   78 -
 .../cpp/xml/Security/cacheserver/csOverflow.xml |   39 -
 .../clientAuthenticationAuthorization.xml       |  177 -
 src/tests/cpp/xml/Security/csAckMirror.xml      |   10 -
 src/tests/cpp/xml/Security/ticket226.xml        |   81 -
 .../CyberTraderPerfVariableTestWithHLRU.xml     |  145 -
 src/tests/cpp/xml/SqLite/csAckMirror.xml        |   10 -
 .../cpp/xml/SqLite/entryEventsOverFlowTest.xml  |  118 -
 .../cpp/xml/SqLite/putGetAllOverFlowTest.xml    |  118 -
 .../cpp/xml/SqLite/regionDestroyOverFlow.xml    |  104 -
 src/tests/cpp/xml/appdomain.list                |    6 -
 src/tests/cpp/xml/autoPdxQTx.list               |   13 -
 src/tests/cpp/xml/autopdx.list                  |   13 -
 .../xml/cacheserver/cacheSizeClientEvents.xml   |   98 -
 src/tests/cpp/xml/cacheserver/cacheserver.xml   |   76 -
 .../cacheserver/cacheserverClientsUpdate.xml    |   47 -
 .../cpp/xml/cacheserver/cacheserverFeedGet.xml  |   43 -
 .../cacheserver/cacheserverFeederUpdates.xml    |   52 -
 .../xml/cacheserver/cacheserverScalability.xml  |   74 -
 .../cpp/xml/cacheserver/csClientEvents.xml      |   78 -
 src/tests/cpp/xml/cacheserver/csOverflow.xml    |   39 -
 .../cpp/xml/cacheserver/failbackfailover.xml    |  103 -
 src/tests/cpp/xml/cacheserver/getsPerf.xml      |  255 --
 src/tests/cpp/xml/cacheserver/intelTest1.xml    |   44 -
 src/tests/cpp/xml/cacheserver/intelTest2.xml    |   65 -
 src/tests/cpp/xml/cacheserver/intelTest3.xml    |   66 -
 src/tests/cpp/xml/cacheserver/latencyPuts.xml   |  430 ---
 .../xml/cacheserver/longrunClientsUpdate.xml    |   69 -
 src/tests/cpp/xml/cacheserver/serverGIIhang.xml |  192 --
 src/tests/cpp/xml/cacheserver/serverMemory.xml  |  103 -
 .../cpp/xml/cacheserver/shortClientEvents.xml   |   94 -
 src/tests/cpp/xml/cacheserver/throughPuts.xml   |  166 -
 src/tests/cpp/xml/clientQConflation.list        |    4 -
 src/tests/cpp/xml/cq.list                       |   15 -
 src/tests/cpp/xml/cron.regression               |   12 -
 src/tests/cpp/xml/csTx/hct/csAckMirror.xml      |   10 -
 .../csTx/hct/staticInterestPolicyAllKeys.xml    |  133 -
 .../hct/staticInterestPolicyAllKeysLateOps.xml  |  138 -
 .../xml/csTx/hct/staticInterestPolicyList.xml   |  133 -
 .../hct/staticInterestPolicyListLateOps.xml     |  139 -
 .../xml/csTx/hct/staticInterestPolicySingle.xml |  127 -
 .../hct/staticInterestPolicySingleLateOps.xml   |  140 -
 src/tests/cpp/xml/delta.list                    |    6 -
 src/tests/cpp/xml/durableCSharp.list            |    9 -
 src/tests/cpp/xml/durableNightly.list           |   15 -
 src/tests/cpp/xml/event/combineEvent.xml        |  285 --
 src/tests/cpp/xml/event/combineEventLong.xml    |  285 --
 src/tests/cpp/xml/event/combineEventMT.xml      |  285 --
 .../cpp/xml/event/combineEventOverflow.xml      |  208 --
 src/tests/cpp/xml/event/entryEvent.xml          |  279 --
 .../cpp/xml/event/entryEventCacheLoader.xml     |  313 --
 src/tests/cpp/xml/event/entryEventDone.xml      |  258 --
 src/tests/cpp/xml/event/entryEventExit.xml      |  258 --
 src/tests/cpp/xml/event/entryEventIT.xml        |  236 --
 src/tests/cpp/xml/event/entryEventIlBug.xml     |  125 -
 src/tests/cpp/xml/event/entryEventLRU.xml       |   59 -
 src/tests/cpp/xml/event/entryEventLong.xml      |  271 --
 src/tests/cpp/xml/event/entryEventMT.xml        |  257 --
 src/tests/cpp/xml/event/entryEventMT100.xml     |  277 --
 src/tests/cpp/xml/event/entryEventMcast.xml     |  273 --
 src/tests/cpp/xml/event/entryEventNewTTL.xml    |  280 --
 src/tests/cpp/xml/event/entryEventOverflow.xml  |  181 -
 src/tests/cpp/xml/event/entryEventSegv.xml      |  258 --
 src/tests/cpp/xml/event/entryEventTCR.xml       |   56 -
 src/tests/cpp/xml/event/entryEventTTL.xml       |  236 --
 src/tests/cpp/xml/event/entryTest.xml           |  167 -
 src/tests/cpp/xml/event/netSearch.xml           |  162 -
 src/tests/cpp/xml/event/quickEntryEvent.xml     |  258 --
 src/tests/cpp/xml/event/regionEvent.xml         |  248 --
 src/tests/cpp/xml/event/regionEventLong.xml     |  248 --
 src/tests/cpp/xml/event/regionEventMT.xml       |  248 --
 src/tests/cpp/xml/event/regionEventOverflow.xml |  171 -
 src/tests/cpp/xml/fullNativePR.list             |   20 -
 src/tests/cpp/xml/functionExecution.list        |   13 -
 src/tests/cpp/xml/functionExecutionCsharp.list  |   12 -
 src/tests/cpp/xml/fwk.list                      |    4 -
 src/tests/cpp/xml/fwk/BBExercise.xml            |   10 -
 src/tests/cpp/xml/fwk/CppPerf.xml               |    8 -
 src/tests/cpp/xml/fwk/TimeResolution.xml        |    8 -
 src/tests/cpp/xml/fwk/UdpIpc.xml                |   21 -
 src/tests/cpp/xml/fwk/stopStartCS.xml           |  165 -
 src/tests/cpp/xml/genericPerf.list              |   43 -
 src/tests/cpp/xml/gfcpp-cache.xsd               |  132 -
 src/tests/cpp/xml/hct/csAckMirror.xml           |   10 -
 .../cpp/xml/hct/dynamicInterestPolicyList.xml   |  139 -
 .../cpp/xml/hct/staticInterestPolicyAllKeys.xml |  132 -
 .../hct/staticInterestPolicyAllKeysLateOps.xml  |  137 -
 .../cpp/xml/hct/staticInterestPolicyList.xml    |  132 -
 .../xml/hct/staticInterestPolicyListLateOps.xml |  138 -
 .../cpp/xml/hct/staticInterestPolicySingle.xml  |  126 -
 .../hct/staticInterestPolicySingleLateOps.xml   |  139 -
 src/tests/cpp/xml/mini/clientEventsFailover.xml |  162 -
 src/tests/cpp/xml/mixedMode.list                |    3 -
 src/tests/cpp/xml/mixedModeCS.list              |    4 -
 src/tests/cpp/xml/nativeNightly.list            |   19 -
 src/tests/cpp/xml/nativeNightlyHA.list          |   10 -
 src/tests/cpp/xml/nativePR.list                 |    7 -
 src/tests/cpp/xml/oneOff.list                   |    2 -
 .../cpp/xml/parReg/subscription/csAckMirror.xml |   12 -
 .../staticInterestPolicyAllKeys.xml             |  132 -
 .../staticInterestPolicyAllKeysLateOps.xml      |  137 -
 .../subscription/staticInterestPolicyList.xml   |  132 -
 .../staticInterestPolicyListLateOps.xml         |  138 -
 .../subscription/staticInterestPolicySingle.xml |  126 -
 .../staticInterestPolicySingleLateOps.xml       |  139 -
 src/tests/cpp/xml/pdx.list                      |   13 -
 src/tests/cpp/xml/pdx/AutoPdx/nestedPdxOps.xml  |  171 -
 src/tests/cpp/xml/pdx/AutoPdx/pdxFailover.xml   |  169 -
 .../xml/pdx/AutoPdx/pdxInstanceFactoryTest.xml  |  144 -
 src/tests/cpp/xml/pdx/AutoPdx/pdxPRRegionFE.xml |  123 -
 .../cpp/xml/pdx/AutoPdx/pdxPRRegionOps.xml      |  115 -
 .../xml/pdx/AutoPdx/pdxPersistentRegionFE.xml   |  123 -
 .../cpp/xml/pdx/AutoPdx/pdxPutGetFEMerge.xml    |  192 --
 .../cpp/xml/pdx/AutoPdx/pdxPutGetMerge.xml      |  176 -
 .../xml/pdx/AutoPdx/pdxPutGetMergeWithRI.xml    |  180 -
 .../xml/pdx/AutoPdx/pdxPutGetPdxInstance.xml    |  135 -
 .../xml/pdx/AutoPdx/pdxReplicatedRegionFE.xml   |  140 -
 .../xml/pdx/AutoPdx/pdxReplicatedRegionRI.xml   |  153 -
 .../cpp/xml/pdx/AutoPdx/serialNestedPdxOps.xml  |  132 -
 src/tests/cpp/xml/pdx/CqQuery/csAckMirror.xml   |   43 -
 .../cpp/xml/pdx/CqQuery/durableCqFailoverR2.xml |  209 --
 .../pdx/CqQuery/durableCqFailoverR2AutoPdx.xml  |  209 --
 .../xml/pdx/CqQuery/durableTimeoutWithCq.xml    |  148 -
 .../pdx/CqQuery/durableWithCqAutoPdxKATrue.xml  |  148 -
 .../xml/pdx/CqQuery/durableWithCqKAFalse.xml    |  149 -
 .../cpp/xml/pdx/CqQuery/durableWithCqKATrue.xml |  148 -
 src/tests/cpp/xml/pdx/CqQuery/multRegCQOps.xml  |  128 -
 .../cpp/xml/pdx/CqQuery/multRegCQOpsAutoPdx.xml |  128 -
 .../CqQuery/multRegServerFailoverAndCQOps.xml   |  158 -
 .../multRegServerFailoverAndCQOpsAutoPdx.xml    |  158 -
 .../resultSetValidationCQAutoPdxTest.xml        |  135 -
 .../pdx/CqQuery/resultSetValidationCQTest.xml   |  135 -
 .../cpp/xml/pdx/CqQuery/serialEntryEvent.xml    |  217 --
 ...ialMultRegOpsCQListenerAutoPdxWithFeeder.xml |  234 --
 .../serialMultRegOpsCQListenerWithFeeder.xml    |  234 --
 .../xml/pdx/CqQuery/serverFailoverAndCQOps.xml  |  150 -
 .../cpp/xml/pdx/CqQuery/singleRegCQOps.xml      |  121 -
 src/tests/cpp/xml/pdx/Pdx/csPRPdxFERegion.xml   |   16 -
 src/tests/cpp/xml/pdx/Pdx/csPartitionRegion.xml |   12 -
 src/tests/cpp/xml/pdx/Pdx/csPdxInstance.xml     |   13 -
 src/tests/cpp/xml/pdx/Pdx/csPersistentRgn.xml   |   14 -
 .../cpp/xml/pdx/Pdx/csReplicatedPdxRegion.xml   |   16 -
 src/tests/cpp/xml/pdx/Pdx/nestedPdxOps.xml      |  171 -
 src/tests/cpp/xml/pdx/Pdx/pdxFailover.xml       |  169 -
 .../cpp/xml/pdx/Pdx/pdxInstanceFactoryTest.xml  |  144 -
 src/tests/cpp/xml/pdx/Pdx/pdxPRRegionFE.xml     |  123 -
 src/tests/cpp/xml/pdx/Pdx/pdxPRRegionOps.xml    |  115 -
 .../cpp/xml/pdx/Pdx/pdxPersistentRegionFE.xml   |  123 -
 src/tests/cpp/xml/pdx/Pdx/pdxPutGetFEMerge.xml  |  192 --
 src/tests/cpp/xml/pdx/Pdx/pdxPutGetMerge.xml    |  176 -
 .../cpp/xml/pdx/Pdx/pdxPutGetMergePdxType.xml   |  117 -
 .../cpp/xml/pdx/Pdx/pdxPutGetMergeWithRI.xml    |  180 -
 .../cpp/xml/pdx/Pdx/pdxPutGetPdxInstance.xml    |  135 -
 .../cpp/xml/pdx/Pdx/pdxReplicatedRegionFE.xml   |  140 -
 .../cpp/xml/pdx/Pdx/pdxReplicatedRegionRI.xml   |  153 -
 .../cpp/xml/pdx/Pdx/serialNestedPdxOps.xml      |  132 -
 .../clientEventsFailoverQueryTest.xml           |  197 --
 .../pdx/RemoteQuery/clientEventsQueryTest.xml   |  139 -
 .../cpp/xml/pdx/RemoteQuery/csAckMirror.xml     |   43 -
 .../pdx/RemoteQuery/csNotifySubscription.xml    |   14 -
 src/tests/cpp/xml/pdx/RemoteQuery/csPR.xml      |   14 -
 .../xml/pdx/RemoteQuery/csServerEviction.xml    |   15 -
 .../pdx/RemoteQuery/csServerOverflowToDisk.xml  |   16 -
 .../cpp/xml/pdx/RemoteQuery/csWithIndex.xml     |   35 -
 .../pdx/RemoteQuery/dataValidationQueryTest.xml |  144 -
 .../distributedDataValidationQueryTest.xml      |  146 -
 .../pdx/RemoteQuery/entryOperationQueryTest.xml |  123 -
 .../xml/pdx/RemoteQuery/failoverQueryTest.xml   |  147 -
 .../xml/pdx/RemoteQuery/regexAndQueryTest.xml   |  129 -
 .../pdx/RemoteQuery/serverEvictionQueryTest.xml |   86 -
 .../serverOverflowToDiskQueryTest.xml           |  122 -
 .../clientEventsFailoverQueryTest.xml           |  209 --
 .../clientEventsQueryAutoPdxTest.xml            |  142 -
 .../pdx/RemoteQueryPR/clientEventsQueryTest.xml |  142 -
 .../cpp/xml/pdx/RemoteQueryPR/csAckMirror.xml   |   29 -
 .../pdx/RemoteQueryPR/csNotifySubscription.xml  |   13 -
 .../xml/pdx/RemoteQueryPR/csServerEviction.xml  |   12 -
 .../cpp/xml/pdx/RemoteQueryPR/csWithIndex.xml   |   41 -
 .../xml/pdx/RemoteQueryPR/csWithIndexRC2.xml    |   42 -
 .../xml/pdx/RemoteQueryPR/csWithOutIndexRC2.xml |   35 -
 .../dataValidationQueryAutoPdxTest.xml          |  136 -
 .../RemoteQueryPR/dataValidationQueryTest.xml   |  136 -
 .../distributedDataValidationQueryTest.xml      |  142 -
 .../RemoteQueryPR/entryOperationQueryTest.xml   |  123 -
 .../RemoteQueryPR/failoverQueryAutoPdxTest.xml  |  222 --
 .../xml/pdx/RemoteQueryPR/failoverQueryTest.xml |  222 --
 .../xml/pdx/RemoteQueryPR/regexAndQueryTest.xml |  128 -
 .../RemoteQueryPR/serverEvictionQueryTest.xml   |   97 -
 src/tests/cpp/xml/pdx/tx/serialEntryEvent.xml   |  210 --
 src/tests/cpp/xml/pdx/tx/serialEntryEventPR.xml |  210 --
 .../xml/pdx/tx/serialEntryEventPRAutoPdx.xml    |  210 --
 .../cpp/xml/pdx/tx/serverFailoverAndCQOps.xml   |  151 -
 .../pdx/tx/serverFailoverAndCQOpsAutoPdx.xml    |  151 -
 src/tests/cpp/xml/pdx/tx/singleRegCQOps.xml     |  121 -
 .../cpp/xml/pdx/tx/singleRegCQOpsAutoPdx.xml    |  121 -
 src/tests/cpp/xml/pdxQTx.list                   |   32 -
 src/tests/cpp/xml/perf.list                     |   43 -
 src/tests/cpp/xml/perf/atomicIncDecTest.xml     |   28 -
 src/tests/cpp/xml/perf/perfBenchmark.xml        |  306 --
 .../cpp/xml/perf/perfBenchmarkOverflow.xml      |  195 --
 src/tests/cpp/xml/perf/perfBenchmarkPub.xml     |  311 --
 .../cpp/xml/perf/perfBenchmarkVaryClients.xml   |  661 ----
 .../cpp/xml/perf/perfBenchmarkVaryClientsOF.xml |  361 --
 .../cpp/xml/perf/perfBenchmarkVaryKeys.xml      |  255 --
 .../cpp/xml/perf/perfBenchmarkVaryValueSize.xml |  255 --
 .../xml/perf/perfBenchmarkVaryValueSizeOF.xml   |  200 --
 src/tests/cpp/xml/perf/perfByteArrayConcat.xml  |   41 -
 src/tests/cpp/xml/perf/perfFairQueue.xml        |  106 -
 src/tests/cpp/xml/perf/perfNodeScale.xml        |   87 -
 src/tests/cpp/xml/perf/perfTest.xml             |  596 ----
 .../cpp/xml/perf/perfTestPutGetDestroy.xml      | 1016 ------
 .../cpp/xml/perf/perfTestPutGetDestroyOF.xml    |  763 -----
 src/tests/cpp/xml/perf/quickPerfTest.xml        |  484 ---
 src/tests/cpp/xml/precheckin.list               |   10 -
 src/tests/cpp/xml/remoteQueryNightly.list       |    9 -
 src/tests/cpp/xml/remoteQueryNightlyPR.list     |    8 -
 src/tests/cpp/xml/run24Hours.list               |    1 -
 src/tests/cpp/xml/scale.list                    |   36 -
 src/tests/cpp/xml/securityNightly.list          |    9 -
 src/tests/cpp/xml/shortNightly.list             |   10 -
 src/tests/cpp/xml/smoketest/ops.spec            |    3 -
 .../cpp/xml/smoketest/perf/csAckMirror.xml      |   10 -
 .../cpp/xml/smoketest/perf/csAckMirrorForCq.xml |   28 -
 .../xml/smoketest/perf/csAckMirrorNSFalse.xml   |   10 -
 .../perf/csAckMirrorNSFalseSelector.xml         |   10 -
 .../perf/csAckMirrorNSFalseSelector1.xml        |   10 -
 .../smoketest/perf/csAckMirrorWithOFtoDisk.xml  |   13 -
 .../smoketest/perf/csDeltaPRCloningFalse.xml    |   23 -
 .../perf/csDeltaPRCloningFalseNSTrue.xml        |   24 -
 .../perf/csDeltaReplicateCloningFalse.xml       |   45 -
 .../xml/smoketest/perf/csDpDefaultNSFalse.xml   |   10 -
 .../cpp/xml/smoketest/perf/csPRNSFalse.xml      |   12 -
 .../xml/smoketest/perf/csPRNSFalseForQuery.xml  |   46 -
 .../perf/csPRNSFalseForQueryiWithIndex.xml      |   47 -
 src/tests/cpp/xml/smoketest/perf/csPRNSTrue.xml |   11 -
 .../cpp/xml/smoketest/perf/csPRNSTrueRC1.xml    |   12 -
 src/tests/cpp/xml/smoketest/perf/getobject.xml  |  116 -
 src/tests/cpp/xml/smoketest/perf/perf016.spec   |    8 -
 src/tests/cpp/xml/smoketest/perf/perf016.xml    |  112 -
 src/tests/cpp/xml/smoketest/perf/perf017.xml    |  111 -
 src/tests/cpp/xml/smoketest/perf/perf020.spec   |    5 -
 src/tests/cpp/xml/smoketest/perf/perf021.spec   |    5 -
 src/tests/cpp/xml/smoketest/perf/perf038.spec   |   10 -
 src/tests/cpp/xml/smoketest/perf/perf061.spec   |    5 -
 src/tests/cpp/xml/smoketest/perf/perf061.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf062.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf063.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf064.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf065.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf067.spec   |    5 -
 src/tests/cpp/xml/smoketest/perf/perf067.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf068.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf069.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf070.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf071.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf073.spec   |   24 -
 src/tests/cpp/xml/smoketest/perf/perf073.xml    |   63 -
 src/tests/cpp/xml/smoketest/perf/perf074.xml    |   59 -
 src/tests/cpp/xml/smoketest/perf/perf075.xml    |   65 -
 src/tests/cpp/xml/smoketest/perf/perf077.xml    |  118 -
 src/tests/cpp/xml/smoketest/perf/perf078.xml    |  118 -
 src/tests/cpp/xml/smoketest/perf/perf079.xml    |  116 -
 src/tests/cpp/xml/smoketest/perf/perf082.xml    |  110 -
 src/tests/cpp/xml/smoketest/perf/perf083.xml    |  110 -
 src/tests/cpp/xml/smoketest/perf/perf088.spec   |    5 -
 src/tests/cpp/xml/smoketest/perf/perf090.xml    |  118 -
 src/tests/cpp/xml/smoketest/perf/perf091.xml    |  118 -
 src/tests/cpp/xml/smoketest/perf/perf092.xml    |  115 -
 src/tests/cpp/xml/smoketest/perf/perf096.xml    |   92 -
 src/tests/cpp/xml/smoketest/perf/perf097.xml    |   92 -
 src/tests/cpp/xml/smoketest/perf/perf098.spec   |   28 -
 src/tests/cpp/xml/smoketest/perf/perf098.xml    |  121 -
 src/tests/cpp/xml/smoketest/perf/perf100.xml    |   94 -
 src/tests/cpp/xml/smoketest/perf/perf102.xml    |   60 -
 src/tests/cpp/xml/smoketest/perf/perf103.xml    |   59 -
 src/tests/cpp/xml/smoketest/perf/perf104.xml    |   59 -
 src/tests/cpp/xml/smoketest/perf/perf105.xml    |   59 -
 src/tests/cpp/xml/smoketest/perf/perf106.xml    |   84 -
 src/tests/cpp/xml/smoketest/perf/perf107.xml    |   84 -
 src/tests/cpp/xml/smoketest/perf/perf108.xml    |   84 -
 src/tests/cpp/xml/smoketest/perf/perf109.xml    |   84 -
 src/tests/cpp/xml/smoketest/perf/perf110.xml    |   81 -
 src/tests/cpp/xml/smoketest/perf/perf111.xml    |   79 -
 src/tests/cpp/xml/smoketest/perf/perf112.xml    |   97 -
 src/tests/cpp/xml/smoketest/perf/perf113.xml    |  120 -
 src/tests/cpp/xml/smoketest/perf/perf114.xml    |  115 -
 src/tests/cpp/xml/smoketest/perf/perf115.xml    |  115 -
 src/tests/cpp/xml/smoketest/perf/perf145.spec   |    5 -
 src/tests/cpp/xml/smoketest/perf/perf148.xml    |  114 -
 src/tests/cpp/xml/smoketest/perf/perf149.xml    |  112 -
 src/tests/cpp/xml/smoketest/perf/perf150.spec   |   10 -
 src/tests/cpp/xml/smoketest/perf/perf150.xml    |  132 -
 src/tests/cpp/xml/smoketest/perf/perf152.xml    |  111 -
 src/tests/cpp/xml/smoketest/perf/perf153.xml    |  133 -
 src/tests/cpp/xml/smoketest/perf/perf154.xml    |  133 -
 .../cpp/xml/smoketest/scale/cacheOpens.spec     |   21 -
 .../cpp/xml/smoketest/scale/cpuActive.spec      |   20 -
 .../cpp/xml/smoketest/scale/createKeys.spec     |   15 -
 .../cpp/xml/smoketest/scale/creategets.spec     |    2 -
 .../cpp/xml/smoketest/scale/createputs.spec     |    2 -
 src/tests/cpp/xml/smoketest/scale/creates.spec  |   15 -
 .../xml/smoketest/scale/createupdateEvents.spec |    2 -
 .../cpp/xml/smoketest/scale/createupdates.spec  |    2 -
 .../scale/csDeltaCloningFalseUseSelector.xml    |   22 -
 .../scale/csDeltaPRCloningFalseUseSelector.xml  |   23 -
 .../smoketest/scale/csFEPartitionedRegion.xml   |   89 -
 .../smoketest/scale/csFEReplicatedRegion.xml    |   88 -
 .../cpp/xml/smoketest/scale/csMirrorDack.xml    |   10 -
 .../smoketest/scale/csMirrorDack5Selector.xml   |   10 -
 .../smoketest/scale/csMirrorDackSelector.xml    |   10 -
 .../xml/smoketest/scale/csPRRC1NoSelector.xml   |   12 -
 .../xml/smoketest/scale/csPRRC1Use5Selector.xml |   12 -
 .../xml/smoketest/scale/csPRRC1UseSelector.xml  |   12 -
 .../cpp/xml/smoketest/scale/extragets.spec      |   11 -
 .../cpp/xml/smoketest/scale/extraputs.spec      |   11 -
 src/tests/cpp/xml/smoketest/scale/gets.spec     |   15 -
 src/tests/cpp/xml/smoketest/scale/memputs.spec  |   15 -
 src/tests/cpp/xml/smoketest/scale/process.spec  |   10 -
 src/tests/cpp/xml/smoketest/scale/putgets.spec  |   34 -
 src/tests/cpp/xml/smoketest/scale/puts.spec     |   15 -
 .../xml/smoketest/scale/putupdateEvents.spec    |    2 -
 src/tests/cpp/xml/smoketest/scale/scale047.xml  |  134 -
 src/tests/cpp/xml/smoketest/scale/scale048.xml  |  137 -
 src/tests/cpp/xml/smoketest/scale/scale049.xml  |  136 -
 src/tests/cpp/xml/smoketest/scale/scale050.xml  |  140 -
 src/tests/cpp/xml/smoketest/scale/scale051.xml  |  131 -
 src/tests/cpp/xml/smoketest/scale/scale052.xml  |  139 -
 src/tests/cpp/xml/smoketest/scale/scale053.xml  |  136 -
 src/tests/cpp/xml/smoketest/scale/scale054.xml  |  137 -
 src/tests/cpp/xml/smoketest/scale/scale055.xml  |  136 -
 src/tests/cpp/xml/smoketest/scale/scale056.xml  |  138 -
 src/tests/cpp/xml/smoketest/scale/scale057.xml  |  138 -
 src/tests/cpp/xml/smoketest/scale/scale058.xml  |  133 -
 src/tests/cpp/xml/smoketest/scale/scale059.xml  |  138 -
 src/tests/cpp/xml/smoketest/scale/scale060.xml  |  138 -
 src/tests/cpp/xml/smoketest/scale/scale061.xml  |  136 -
 src/tests/cpp/xml/smoketest/scale/scale062.xml  |  140 -
 src/tests/cpp/xml/smoketest/scale/scale063.xml  |  136 -
 src/tests/cpp/xml/smoketest/scale/scale064.xml  |  139 -
 src/tests/cpp/xml/smoketest/scale/scale065.xml  |  139 -
 src/tests/cpp/xml/smoketest/scale/scale066.xml  |  152 -
 src/tests/cpp/xml/smoketest/scale/scale071.xml  |  149 -
 src/tests/cpp/xml/smoketest/scale/scale072.xml  |  149 -
 src/tests/cpp/xml/smoketest/scale/scale073.xml  |  152 -
 src/tests/cpp/xml/smoketest/scale/scale074.xml  |  146 -
 src/tests/cpp/xml/smoketest/scale/scale075.xml  |  149 -
 src/tests/cpp/xml/smoketest/scale/scale076.xml  |  150 -
 src/tests/cpp/xml/smoketest/scale/scale077.xml  |  147 -
 src/tests/cpp/xml/smoketest/scale/scale078.xml  |  151 -
 src/tests/cpp/xml/smoketest/scale/scale079.xml  |  150 -
 src/tests/cpp/xml/smoketest/scale/scale080.xml  |  151 -
 src/tests/cpp/xml/smoketest/scale/scale081.xml  |  146 -
 src/tests/cpp/xml/smoketest/scale/scale082.xml  |  150 -
 src/tests/cpp/xml/smoketest/scale/scale083.xml  |  153 -
 src/tests/cpp/xml/smoketest/scale/scale084.xml  |  150 -
 src/tests/cpp/xml/smoketest/scale/scale085.xml  |  154 -
 src/tests/cpp/xml/smoketest/scale/scale086.xml  |  154 -
 .../cpp/xml/smoketest/scale/updateEvents.spec   |   11 -
 src/tests/cpp/xml/smoketest/scale/updates.spec  |   15 -
 .../xml/smoketest/scale/updateupdateEvents.spec |   27 -
 src/tests/cpp/xml/ssl.list                      |    2 -
 src/tests/cpp/xml/subscription.list             |   18 -
 src/tests/cpp/xml/targetedRegression.list       |   49 -
 src/tests/cpp/xml/testDefinition.xsd            |  228 --
 1201 files changed, 147895 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/64bit/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/64bit/csAckMirror.xml b/src/tests/cpp/xml/64bit/csAckMirror.xml
deleted file mode 100644
index 9d0cf6f..0000000
--- a/src/tests/cpp/xml/64bit/csAckMirror.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="empty"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/64bit/memoryMeasurement.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/64bit/memoryMeasurement.xml b/src/tests/cpp/xml/64bit/memoryMeasurement.xml
deleted file mode 100644
index 194f886..0000000
--- a/src/tests/cpp/xml/64bit/memoryMeasurement.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>400000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="JCS" hostGroup="CS"/>
-  <client-set  name="ThinClient" hostGroup="CS1"/>
-  <client-set name="Feeder" hostGroup="CS2"/>
-
-  <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">64bit/csAckMirror.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 5120</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set  name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set  name="ThinClient"/>
-    </task>
-    <!--task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="30m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="15m">
-      <client-set  name="ThinClient"/>
-    </task>
-    <task name="Destroy" action="doLocalDestroyEntries" container="perftests" waitTime="15m">
-      <client-set  name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="Puts" action="doPuts" container="perftests" waitTime="20m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Measuring memory" action="doMemoryMeasurement" container="perftests" waitTime="2m">
-      <client-set  name="ThinClient"/>
-      <data name="expectedSizeInMB">4000</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/AppDomainTest/clientEventsAppDomainTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/AppDomainTest/clientEventsAppDomainTest.xml b/src/tests/cpp/xml/AppDomainTest/clientEventsAppDomainTest.xml
deleted file mode 100644
index b6ed88f..0000000
--- a/src/tests/cpp/xml/AppDomainTest/clientEventsAppDomainTest.xml
+++ /dev/null
@@ -1,113 +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="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <data name="regionSpec">ThinClientRegion</data>
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" 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="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="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="cacheserver" waitTime="2m">
-      <client-set count="10" name="Client"/>
-      <data name="appdomain">AppDomainTest</data>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="2h10m">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="cacheserver" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-    </task>
-    <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>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/AppDomainTest/clientEventsFailoverAppDomain.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/AppDomainTest/clientEventsFailoverAppDomain.xml b/src/tests/cpp/xml/AppDomainTest/clientEventsFailoverAppDomain.xml
deleted file mode 100644
index 55b5422..0000000
--- a/src/tests/cpp/xml/AppDomainTest/clientEventsFailoverAppDomain.xml
+++ /dev/null
@@ -1,174 +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="redundancyLevel">1</data>
-  
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>stop</item>
-      <item>stop</item>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <data name="regionSpec">ThinClientRegion</data> 
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativePR/csNotifySubscription.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="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="10" name="Client"/>
-    </task>    
-    <task name="Register All Keys" action="doRegisterAllKeys" container="cacheserver" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="30m" parallel="true">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="cacheserver" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-    </task>
-    <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>


[05/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/perfTestPutGetDestroyTCRscaledUp.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/perfTestPutGetDestroyTCRscaledUp.xml b/src/tests/cpp/xml/Native43/perfTestPutGetDestroyTCRscaledUp.xml
deleted file mode 100644
index c3c6d29..0000000
--- a/src/tests/cpp/xml/Native43/perfTestPutGetDestroyTCRscaledUp.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-      <item>1000</item>
-      <item>10000</item>
-      <!--item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-             <!--item>5000</item>
-             <item>10000</item-->
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1"/>
-  <client-set name="JCS2"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-  <client-set name="Putter3"/>
-  <client-set name="Getter3"/>
-  <client-set name="Destroyer3"/>
-  <client-set name="Putter4"/>
-  <client-set name="Getter4"/>
-  <client-set name="Destroyer4"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer CS3" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS3 Native43/csAckMirror.xml</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="SetupCacheServer CS4" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS4 Native43/csAckMirror.xml</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS3</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS4</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-	   <!-- create region and measure throughput for putter,getter,destroyer - 3 -->
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter3"/>
-      <data name="TAG">CS3</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter3"/>
-      <data name="TAG">CS3</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer3"/>
-      <data name="TAG">CS3</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter3"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter3"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer3"/>
-    </task>
-	   <!-- create region and measure throughput for putter,getter,destroyer - 4 -->
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter4"/>
-      <data name="TAG">CS4</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter4"/>
-      <data name="TAG">CS4</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer4"/>
-      <data name="TAG">CS4</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter4"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter4"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer4"/>
-    </task>
-	   <!-- stopping all the 4 servers -->
-
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers CS3" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS3</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers CS4" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS4</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/perfTestPutGetDestroy_FullInterestTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/perfTestPutGetDestroy_FullInterestTCR.xml b/src/tests/cpp/xml/Native43/perfTestPutGetDestroy_FullInterestTCR.xml
deleted file mode 100644
index 2eb1e23..0000000
--- a/src/tests/cpp/xml/Native43/perfTestPutGetDestroy_FullInterestTCR.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="true" mirroring="false"
-            interest-list-enabled="false" initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csNotifySubscription.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csNotifySubscription.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/perfTestPutGetDestroy_PartialInterestTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/perfTestPutGetDestroy_PartialInterestTCR.xml b/src/tests/cpp/xml/Native43/perfTestPutGetDestroy_PartialInterestTCR.xml
deleted file mode 100644
index fc80e1d..0000000
--- a/src/tests/cpp/xml/Native43/perfTestPutGetDestroy_PartialInterestTCR.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="true" mirroring="false"
-            interest-list-enabled="false" initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csNotifySubscription.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csNotifySubscription.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/registerAllKeysTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/registerAllKeysTest.xml b/src/tests/cpp/xml/Native43/registerAllKeysTest.xml
deleted file mode 100644
index 66d51cd..0000000
--- a/src/tests/cpp/xml/Native43/registerAllKeysTest.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="true" mirroring="false"
-            interest-list-enabled="false" initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csNotifySubscription.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csNotifySubscription.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/verifyKeyCountTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/verifyKeyCountTest.xml b/src/tests/cpp/xml/Native43/verifyKeyCountTest.xml
deleted file mode 100644
index 8e9ee8c..0000000
--- a/src/tests/cpp/xml/Native43/verifyKeyCountTest.xml
+++ /dev/null
@@ -1,97 +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="EntryCount">10000</data>
-  <data name="valueSizes">3000</data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="true" mirroring="false"
-            interest-list-enabled="false" initial-capacity="18500" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="regionName">TestTCR1</data>
-
-  <client-set name="CS1"/>
-  <client-set name="CS2"/>
-  <client-set name="client1"/>
-  <client-set name="client2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csAckMirror.xml</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="5m">
-      <client-set name="client1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="5m">
-      <client-set name="client2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="Populate Entries in publisher" action="doAddEntry" container="eventtest" waitTime="15m">
-      <client-set name="client1"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="client1"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify Key Count" action="doVerifyKeyCount" container="eventtest" waitTime="600">
-      <client-set name="client1"/>
-      <data name="expectedKeyCount">10000</data>
-    </task>
-    <task name="Verify Key Count before get" action="doVerifyKeyCount" container="eventtest" waitTime="600">
-      <client-set name="client2"/>
-      <data name="expectedKeyCount">0</data>
-    </task>
-    <task name="Gets Entries in client2" action="doGets" container="eventtest" waitTime="15m">
-      <client-set name="client2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify Key Count" action="doVerifyKeyCount" container="eventtest" waitTime="600">
-      <client-set name="client2"/>
-      <data name="expectedKeyCount">10000</data>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/verifyKeyCountWithFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/verifyKeyCountWithFailover.xml b/src/tests/cpp/xml/Native43/verifyKeyCountWithFailover.xml
deleted file mode 100644
index 6eaf5fb..0000000
--- a/src/tests/cpp/xml/Native43/verifyKeyCountWithFailover.xml
+++ /dev/null
@@ -1,64 +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="EntryCount">300000</data>
-  <data name="valueSizes">3000</data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="true" client-notification="false"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="regionName">TestTCR1</data>
-
-
-  <client-set name="Feeder"/>
-  <client-set name="JavaCacheServer"/>
-  <client-set count="10" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native43/csAckMirror.xml</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-c 3</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRootRegion" container="eventtest" waitTime="10m">
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Populate Entry" action="doAddEntry" container="eventtest" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Get Entries" action="doGets" container="eventtest" waitTime="30m" parallel="true">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer" action="doRunProcessAndSleep" container="utils" waitTime="5m" continueOnError="true" parallel="true">
-      <data name="program">stopJavaServers 2;sleep 60 ; startJavaServers 2</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="Verify Key Count" action="doVerifyKeyCount" container="eventtest" waitTime="600">
-      <client-set count="10" name="Client"/>
-      <data name="expectedKeyCount">300000</data>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-c 3</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/clientEventsHAFailover_FullInterest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/clientEventsHAFailover_FullInterest.xml b/src/tests/cpp/xml/NativeHA/clientEventsHAFailover_FullInterest.xml
deleted file mode 100644
index 4d303d4..0000000
--- a/src/tests/cpp/xml/NativeHA/clientEventsHAFailover_FullInterest.xml
+++ /dev/null
@@ -1,168 +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="redundancyLevel">2</data>
-  <data name="minServers">2</data>
-  <data name="distinctKeys">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" 
-                    client-notification="true" lru-entries-limit="500"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="30" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m">
-      <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">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="30" name="Client"/>
-    </task>
-
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="30" name="Client"/>
-    </task>
-
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="50m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/clientEventsHAFailover_PartialInterest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/clientEventsHAFailover_PartialInterest.xml b/src/tests/cpp/xml/NativeHA/clientEventsHAFailover_PartialInterest.xml
deleted file mode 100644
index ae01170..0000000
--- a/src/tests/cpp/xml/NativeHA/clientEventsHAFailover_PartialInterest.xml
+++ /dev/null
@@ -1,171 +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="redundancyLevel">2</data>
-  <data name="minServers">1</data>
-  <data name="distinctKeys">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" 
-                      client-notification="true" lru-entries-limit="500"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="30" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m">
-      <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">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="30" name="Client"/>
-    </task>
-
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set count="30" name="Client"/>
-    </task>
-
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="1h10m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/clientPayloadScalability.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/clientPayloadScalability.xml b/src/tests/cpp/xml/NativeHA/clientPayloadScalability.xml
deleted file mode 100644
index eb9470e..0000000
--- a/src/tests/cpp/xml/NativeHA/clientPayloadScalability.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient1"/>
-  <client-set name="ThinClient2"/>
-
-  <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">-c 2 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="ThinClient1"/>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient1"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>5120</item>
-          <item>10240</item>
-          <item>512000</item>
-          <item>102400</item>
-          <item>5242880</item>
-          <item>10485760</item>
-          <item>31457280</item>
-          <item>52428800</item>
-          <item>73400320</item>
-          <item>104857600</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient1"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient1"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>209715200</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient1"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient1"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>314572800</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient1"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="2h">
-      <client-set name="ThinClient1"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>419430400</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroy Entries" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="ThinClient1"/>
-      <data name="distinctKeys">
-        <list>
-          <item>2</item>
-        </list>
-      </data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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/NativeHA/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/csAckMirror.xml b/src/tests/cpp/xml/NativeHA/csAckMirror.xml
deleted file mode 100644
index ba56d41..0000000
--- a/src/tests/cpp/xml/NativeHA/csAckMirror.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/csNackMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/csNackMirror.xml b/src/tests/cpp/xml/NativeHA/csNackMirror.xml
deleted file mode 100644
index b7511e5..0000000
--- a/src/tests/cpp/xml/NativeHA/csNackMirror.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-no-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/failoverTestHAEventIDMap.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/failoverTestHAEventIDMap.xml b/src/tests/cpp/xml/NativeHA/failoverTestHAEventIDMap.xml
deleted file mode 100644
index 62f93ab..0000000
--- a/src/tests/cpp/xml/NativeHA/failoverTestHAEventIDMap.xml
+++ /dev/null
@@ -1,154 +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="redundancyLevel">1</data>
-  <data name="minServers">2</data>
- 
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true" />
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="ThinClientRegion2">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createDupChecker"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>  
-  <!--data name="regionSpec">ThinClientRegion</data-->
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="IdleThinClient"/>
-  <client-set count="4" name="Feeder"/>
-
-  <test name="ThinClientFailoverHAEventIDMap" description="Thin Client HA Failover EventIDMap test with redundancy satisfied">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion1" action="doCreateRegion" container="perftests" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="4" name="Feeder"/>
-    </task>
-    <task name="CreateRegion2" action="doCreateRegion" container="perftests" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion2</data>
-      <client-set count="10" name="IdleThinClient"/>
-    </task>
-    
-    <task name="Register Interest All Keys" action="doRegisterAllKeys" container="perftests" waitTime="15m">
-      <client-set count="10" name="IdleThinClient"/>
-      <data name="regionSpec">ThinClientRegion2</data>
-    </task>
-    
-    <task name="Puts1" action="doSerialPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="1" count="1" name="Feeder"/>
-      <data name="keyStart">1</data>
-      <data name="keyEnd">250</data>
-      <data name="regionSpec">ThinClientRegion1</data>
-    </task>
-    <task name="Puts2" action="doSerialPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="2" count="1" name="Feeder"/>
-      <data name="keyStart">251</data>
-      <data name="keyEnd">500</data>
-      <data name="regionSpec">ThinClientRegion1</data>
-    </task>
-    <task name="Puts3" action="doSerialPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="3" count="1" name="Feeder"/>
-      <data name="keyStart">501</data>
-      <data name="keyEnd">750</data>
-      <data name="regionSpec">ThinClientRegion1</data>
-    </task>
-    <task name="Puts4" action="doSerialPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="4" count="1" name="Feeder"/>
-      <data name="keyStart">751</data>
-      <data name="keyEnd">1000</data>
-      <data name="regionSpec">ThinClientRegion1</data>
-    </task>
-    
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="1h30m" 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="1h30m" 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="1h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="15m"/>
-    
-    <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/NativeHA/failoverTestHARedundancyMet.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/failoverTestHARedundancyMet.xml b/src/tests/cpp/xml/NativeHA/failoverTestHARedundancyMet.xml
deleted file mode 100644
index cfb832b..0000000
--- a/src/tests/cpp/xml/NativeHA/failoverTestHARedundancyMet.xml
+++ /dev/null
@@ -1,138 +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="redundancyLevel">1</data>
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</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">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientFailoverHARedundancyMet" description="Thin Client HA Failover test with redundancy satisfied">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register Partial Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="5" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="1h30m" 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="1h30m" 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="1h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/failoverTestHARedundancyNotMet.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/failoverTestHARedundancyNotMet.xml b/src/tests/cpp/xml/NativeHA/failoverTestHARedundancyNotMet.xml
deleted file mode 100644
index 3e2fb21..0000000
--- a/src/tests/cpp/xml/NativeHA/failoverTestHARedundancyNotMet.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">
-
-  <data name="redundancyLevel">3</data>
-
-  <data name="timedInterval">10m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientFailoverHARedundancyNotMet" description="Thin Client HA Failover test with redundancy not satisfied">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register Partial Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="5" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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>


[31/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsQueryTest.xml
deleted file mode 100644
index 631f95a..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsQueryTest.xml
+++ /dev/null
@@ -1,142 +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="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="entryCount">10000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  <data name="unsupportedPRQuery">true</data> 
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <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" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-     <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="1h10m" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>query</item>
-        </oneof>
-      </data>
-      <data name="workTime">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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/RemoteQueryPR/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csAckMirror.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csAckMirror.xml
deleted file mode 100644
index aa662a5..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csAckMirror.xml
+++ /dev/null
@@ -1,86 +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="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <!--class-name>javaobject.newapi.Portfolio</class-name-->
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>1</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-            </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-  <region name="Positions">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csNotifySubscription.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csNotifySubscription.xml
deleted file mode 100644
index d20ed43..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csNotifySubscription.xml
+++ /dev/null
@@ -1,69 +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="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>1</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-            </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csServerEviction.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csServerEviction.xml
deleted file mode 100644
index 5a266bf..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csServerEviction.xml
+++ /dev/null
@@ -1,69 +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="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-      <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>1</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-             </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndex.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndex.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndex.xml
deleted file mode 100644
index 09bc293..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndex.xml
+++ /dev/null
@@ -1,97 +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" maximum-time-between-pings="600000" />
-  <region name="IndexRegion">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>76343</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-            </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-  <region name="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index1" type="range" from-clause="/Portfolios" expression="ID" />
-    <index name="index5" type="range" from-clause="/Portfolios.keys" expression="toString" />
-    <index name="index7" type="range" from-clause="/Portfolios.values k" expression="nvl(k.position2.toString(),'nopes')" />
-    <index name="index8" type="range" from-clause="/Portfolios.keys k" expression="k" />
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index2" type="range" from-clause="/Portfolios2" expression="ID" />
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index3" type="range" from-clause="/Portfolios3" expression="ID" />
-  </region>
-  <region name="Positions">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index4" type="range" from-clause="/Positions" expression="secId" />
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndexRC2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndexRC2.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndexRC2.xml
deleted file mode 100644
index 28c08c8..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndexRC2.xml
+++ /dev/null
@@ -1,98 +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" maximum-time-between-pings="600000" />
-  <region name="IndexRegion">
-    <!--region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes-->
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>76343</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-            </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-  <region name="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index1" type="range" from-clause="/Portfolios" expression="ID" />
-    <index name="index5" type="range" from-clause="/Portfolios.keys" expression="toString" />
-    <index name="index7" type="range" from-clause="/Portfolios.values k" expression="nvl(k.position2.toString(),'nopes')" />
-    <index name="index8" type="range" from-clause="/Portfolios.keys k" expression="k" />
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index2" type="range" from-clause="/Portfolios2" expression="ID" />
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index3" type="range" from-clause="/Portfolios3" expression="ID" />
-  </region>
-  <region name="Positions">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index4" type="range" from-clause="/Positions" expression="secId" />
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithOutIndexRC2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithOutIndexRC2.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithOutIndexRC2.xml
deleted file mode 100644
index ee3a9b4..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithOutIndexRC2.xml
+++ /dev/null
@@ -1,91 +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" maximum-time-between-pings="600000" />
-  <region name="IndexRegion">
-    <!--region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes-->
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>76343</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-            </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-  <region name="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <region name="Positions">
-    <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/RemoteQueryPR/dataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/dataValidationQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/dataValidationQueryTest.xml
deleted file mode 100644
index 3321d94..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/dataValidationQueryTest.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="string,Position">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Position">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" continueOnError="true" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" continueOnError="true" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/distributedDataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/distributedDataValidationQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/distributedDataValidationQueryTest.xml
deleted file mode 100644
index 598f208..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/distributedDataValidationQueryTest.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="client1"/>
-  <client-set name="client2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csWithIndex.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="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" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="client1"/>
-      <client-set name="client2"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="client1"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="client1"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="client1"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Position">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="client1"/>
-      <client-set name="client2"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Position">
-      <data name="regionName">Positions</data>
-      <client-set name="client1"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,Portfolio">
-      <client-set name="client2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,Portfolio">
-      <client-set name="client2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="Running Param Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,Portfolio">
-      <client-set name="client2"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,Portfolio">
-      <client-set name="client2"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="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" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/entryOperationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/entryOperationQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/entryOperationQueryTest.xml
deleted file mode 100644
index 5fec626..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/entryOperationQueryTest.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>10000</item>
-          <item>500</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>9500</item>
-          <item>475</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/failoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/failoverQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/failoverQueryTest.xml
deleted file mode 100644
index 6020101..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/failoverQueryTest.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">4</data>
- 	
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-	
-  <data name="sleepTime">
-    <oneof>
-      <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="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="Feeder"/>
-  <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="JCS6" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-
-  <test name="QueryFailoverTest" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csWithIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 7 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csWithOutIndexRC2.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StartCacheServer 7" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">7</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="3m" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <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="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="10" name="ThinClient"/>
-      <data name="sleepTime">3</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="20" waitTime="1h" continueOnError="true" parallel="true" argTypes="String,Portfolio">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="20" waitTime="1h" continueOnError="true" parallel="true" argTypes="String,Portfolio">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-     <task name="Running Param Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 5" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="stopStartCacheServer 6" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="stopStartCacheServer 7" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">7</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StopCacheServer 7" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">7</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/regexAndQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/regexAndQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/regexAndQueryTest.xml
deleted file mode 100644
index 4de9688..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/regexAndQueryTest.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="ThinClient1"/>
-  <client-set name="ThinClient2"/>
-
-  <test name="ThinClientRegexNQuery" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Populate Entries in ThinClient1" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Gets" action="doGetObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,Portfolio">
-      <data name="registerRegex">port.*</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="ThinClient2"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Update Entries from ThinClient1" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="45m" parallel="true" argTypes="String,Portfolio">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-          <item>500</item>
-          <item>1000</item>
-          <item>10000</item>
-        </list>
-      </data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="45m" parallel="true" argTypes="String,Portfolio">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="45m" parallel="true" argTypes="String,Portfolio">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/serverEvictionQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/serverEvictionQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/serverEvictionQueryTest.xml
deleted file mode 100644
index 4cd4e0c..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/serverEvictionQueryTest.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csServerEviction.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"> 
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for result set test" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/basicTx.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/basicTx.xml b/src/tests/cpp/xml/Generics/ResumableTx/basicTx.xml
deleted file mode 100755
index faa4328..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/basicTx.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">600</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  
-  <data name="keyType">str</data>
-  <data name="clientCount">3</data>
-  <data name="minExecutions">100</data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" locators="true" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" />
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-   
-  <test name="BasicTransactiontest" description="This is a Basic test ,which will test the general transactional flow with a single Thread.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 1 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="String,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="String,String">
-      <client-set count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="String,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Populate Entries" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="String,String">
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Basic Transactions " action="doBasicTX" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="String,String">
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="String,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-   </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/concPRFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/concPRFailover.xml b/src/tests/cpp/xml/Generics/ResumableTx/concPRFailover.xml
deleted file mode 100755
index 940f7f8..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/concPRFailover.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">5m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  <data name="TxBool">
-    <oneof>
-      <item>true</item>
-      <item>false</item>
-    </oneof>
-  </data>
-  
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
-  <data name="minServers">3</data>
-  
-  <data name="keyType">str</data>
-  <data name="clientCount">3</data>
-  <data name="isConcurrentExecution">true</data>
-  <data name="minExecutions">10</data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" servers="true"/>
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-         <cache-listener library="resumabletx" 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 name="JCS5" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-  
-  <test name="ConcurrentPRFailOverTest" description="This test runs with multiple bridgeServers and edge clients.  The servers host a PartitionedRegion. 
-Edge clients execute concurrent resumeable transactions using function execution. Active transactions are maintained in a map on the BB.
-After a configurable mininum number of suspend+doOps+resume executions have completed the transactions are committed.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csPRTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Do Conc Tx With Random Ops" action="doConcTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String" parallel="true">
-       <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <!--item>invalidate</item-->
-          <!--item>destroy</item-->
-          <item>update</item>
-          <item>get</item>
-          <!--item>putAll</item-->          
-        </oneof>
-      </data>
-      <data name="opsSecond">5</data>
-      <data name="regionName">TestTCR1</data>
-      <data name="workTime">100</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="3" name="Client"/>
-    </task> 
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set count="3" name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>	
-    <task name="finish All Active Tx" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" 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/ResumableTx/concPRWithOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/concPRWithOps.xml b/src/tests/cpp/xml/Generics/ResumableTx/concPRWithOps.xml
deleted file mode 100755
index fb787ec..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/concPRWithOps.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">5m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  <data name="TxBool">
-    <oneof>
-      <item>true</item>
-      <item>false</item>
-    </oneof>
-  </data>
-  
-  <data name="keyType">str</data>
-  <data name="clientCount">3</data>
-  <data name="isConcurrentExecution">true</data>
-  <data name="minExecutions">10</data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" servers="true"/>
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-         <cache-listener library="resumabletx" 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 name="JCS5" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-  
-  <test name="ConcurrentPRTest" description="This test runs with multiple bridgeServers and edge clients.  The servers host a PartitionedRegion. 
-Edge clients execute concurrent resumeable transactions using function execution. Active transactions are maintained in a map on the BB.
-After a configurable mininum number of suspend+doOps+resume executions have completed the transactions are committed.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csPRTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Do Conc Tx With Random Ops" action="doConcTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-       <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="opsSecond">5</data>
-      <data name="regionName">TestTCR1</data>
-      <data name="workTime">100</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="3" name="Client"/>
-    </task> 
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set count="3" name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>	
-    <task name="finish All Active Tx" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" 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>


[11/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/sampleJavaCS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/sampleJavaCS.xml b/src/tests/cpp/xml/Misc/sampleJavaCS.xml
deleted file mode 100644
index 8ea97fe..0000000
--- a/src/tests/cpp/xml/Misc/sampleJavaCS.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This xml is an example of how to use the new scripts to manage Java Servers. -->
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <!-- Please note that the endpoints in the region definition below will only be used if
-       the BB does not have a value for "GFE_BB", "EndPoints". 
-       This value is set by the setupJavaServers script.-->
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" mirroring="false"
-            client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="client"/>
-  
-  <test name="Sample Java CS" description="nada" waitTime="600">
-    <task name="Setup Java CS" action="doRunProcess" container="utils" waitTime="600">
-      <!-- This script takes one argument, the xml file to use as a base in creating the cache.xml the cacheserver will use.
-            The only modification done to the file is to replace "999999999" with the correct port number to use. 
-            This script does expect to find a number of environment variables defined, see comments in the script for details.-->
-      <data name="program">$GFBASE/framework/scripts/setupJavaServers</data>
-      <data name="arguments">csAckMirror.xml</data>
-    </task>
-    <task name="Setup Java CS" action="doRunProcess" container="utils" waitTime="600">
-      <!-- If this script is not given an argument, it starts all the cacheservers that were setup.
-           If it is given an argument, it attempts to use it's first argument as the number of the cacheserver to start. -->
-      <data name="program">$GFBASE/framework/scripts/startJavaServers</data>
-      <data name="arguments"></data>
-    </task>
-    <task name="Create Region" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Destroy Region" action="doLocalDestroyRegion" container="perftests" waitTime="10m"/>
-    <task name="Stop Java CS" action="doRunProcess" container="utils" waitTime="600">
-      <!-- This script will stop the Java Servers. If no argument is given, all servers are stopped.
-           If one argument is given, it is used as the number of the server to stop. -->
-      <data name="program">$GFBASE/framework/scripts/stopJavaServers</data>
-      <data name="arguments"></data>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/smallMembership.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/smallMembership.xml b/src/tests/cpp/xml/Misc/smallMembership.xml
deleted file mode 100755
index bc32e12..0000000
--- a/src/tests/cpp/xml/Misc/smallMembership.xml
+++ /dev/null
@@ -1,20 +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="AckMirrorIl">
-    <snippet>
-      <region name="AckMirrorIl">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="true"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <test name="Distributed System" description="Distributed System test" waitTime="5400">
-    <task name="DistributedMemberCount" action="doDistributedMemberCount" container="eventtest" waitTime="600">
-    </task>
-    <task name="Verify CreateRegion-AckMirrorIl" action="doVerifyPeerCount" container="eventtest" waitTime="600">
-      <data name="regionSpec">AckMirrorIl</data>
-      <data name="regionName">AckMirrorIl</data>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/CyberTraderInterestListUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/CyberTraderInterestListUpdateTest.xml b/src/tests/cpp/xml/MixedMode/CyberTraderInterestListUpdateTest.xml
deleted file mode 100644
index 14cdef6..0000000
--- a/src/tests/cpp/xml/MixedMode/CyberTraderInterestListUpdateTest.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>3000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCC1" hostGroup="CS"/>
-  <client-set name="JCC2" 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" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-t CS1 MixedMode/bridge_client.xml</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-t CS2 MixedMode/bridge_client.xml</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Register Interest List in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo reg keytype=str keyrange=100-1100 base=AAAAAAAAAA seqid=1 >> JC_CS1_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Register Interest List in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo reg keytype=str keyrange=100-1100 base=AAAAAAAAAA seqid=1 >> JC_CS2_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="waitForRegToFinish" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS1 -p 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForRegToFinish" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS2 -p 1</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Get Entries in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=str keyrange=0-184877 base=AAAAAAAAAA seqid=2 >> JC_CS1_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Get Entries in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=str keyrange=0-184877 base=AAAAAAAAAA seqid=2 >> JC_CS2_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Gets Entries in Subscriber" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="waitForGetsToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS1 -p 2</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForGetsToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS2 -p 2</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=str keyrange=100-1100 base=AAAAAAAAAA valuesize=500 seqid=3 >> JC_CS1_1.cmd; echo mverify keytype=str keyrange=1100-2000 base=AAAAAAAAAA valuesize=3000 seqid=4 >> JC_CS1_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Verify update list in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=str keyrange=100-1100 base=AAAAAAAAAA valuesize=500 seqid=3 >> JC_CS2_1.cmd; echo mverify keytype=str keyrange=1100-2000 base=AAAAAAAAAA valuesize=3000 seqid=4 >> JC_CS2_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="waitForVerifyToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS1 -p 3</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForVerifyToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS2 -p 3</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="waitForVerifyToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS1 -p 4</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForVerifyToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS2 -p 4</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_CS1_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_CS2_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/bridge_client.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/bridge_client.xml b/src/tests/cpp/xml/MixedMode/bridge_client.xml
deleted file mode 100644
index 8f8b62f..0000000
--- a/src/tests/cpp/xml/MixedMode/bridge_client.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Initializes a bridge client for a bridge server that runs on port 40404.
-     Loads values and sends updates to the server. -->
-
-<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" is-server="false">
-  <region name="TestTCR1">
-    <region-attributes scope="local">
-      <cache-loader>
-        <class-name>org.apache.geode.cache.util.BridgeLoader</class-name>
-        <parameter name="endpoints">
-          <string>server=$ENDPOINT</string>
-        </parameter>
-        <parameter name="readTimeout">
-          <string>60000</string>
-        </parameter>
-      </cache-loader>
-      <cache-writer>
-        <class-name>org.apache.geode.cache.util.BridgeWriter</class-name>
-        <parameter name="endpoints">
-          <string>server=$ENDPOINT</string>
-        </parameter>
-        <parameter name="establishCallbackConnection">
-          <string>true</string>
-        </parameter>
-        <parameter name="readTimeout">
-          <string>60000</string>
-        </parameter>
-      </cache-writer>
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/bridge_client_cacheless.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/bridge_client_cacheless.xml b/src/tests/cpp/xml/MixedMode/bridge_client_cacheless.xml
deleted file mode 100644
index 417cbed..0000000
--- a/src/tests/cpp/xml/MixedMode/bridge_client_cacheless.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Initializes a bridge client for a bridge server that runs on port 40404.
-     Loads values and sends updates to the server. -->
-
-<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" is-server="false">
-  <region name="TestTCR1">
-    <region-attributes scope="local">
-      <cache-loader>
-        <class-name>org.apache.geode.cache.util.BridgeLoader</class-name>
-        <parameter name="endpoints">
-          <string>server=$ENDPOINT</string>
-        </parameter>
-        <parameter name="readTimeout">
-          <string>60000</string>
-        </parameter>
-      </cache-loader>
-      <cache-writer>
-        <class-name>org.apache.geode.cache.util.BridgeWriter</class-name>
-        <parameter name="endpoints">
-          <string>server=$ENDPOINT</string>
-        </parameter>
-        <parameter name="establishCallbackConnection">
-          <string>true</string>
-        </parameter>
-        <parameter name="readTimeout">
-          <string>60000</string>
-        </parameter>
-      </cache-writer>
-      <eviction-attributes>
-        <lru-entry-count maximum="1" action="local-destroy"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/clientUserObject.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/clientUserObject.xml b/src/tests/cpp/xml/MixedMode/clientUserObject.xml
deleted file mode 100644
index bb4c2c9..0000000
--- a/src/tests/cpp/xml/MixedMode/clientUserObject.xml
+++ /dev/null
@@ -1,189 +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">UserObject</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="className">
-    <list>
-      <item>ExampleObject</item>
-      <item>User</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="objValue">15</data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="CS" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-  <client-set name="Reader"/>
-  <client-set name="JCC1" hostGroup="CS"/>
-  <client-set name="JCC2" hostGroup="CS"/>
-  <client-set name="JFeeder" hostGroup="CS"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native/csAckMirror.xml</data>
-      <client-set name="CS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 1 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 2 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 3 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 2</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 3</data>
-      <client-set name="JFeeder"/>
-    </task>
-
-    <task name="Init CPP clients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <client-set name="Reader"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Feeder"/>
-      <client-set name="Reader"/>
-    </task>
-
-    <task name="put objects at CPP" action="doPuts" container="userobject" waitTime="10m">
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify objects from java client1" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=str base=ExampleObject keyrange=0-100 value=15 valuetype=obj seqid=1 >> JC_1.cmd; echo mverify keytype=str base=User keyrange=0-100 value=15 valuetype=usr seqid=2 >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="wait seq 1 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="wait for seq 2 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 2</data>
-      <client-set name="JCC1"/>
-    </task>
-
-    <task name="put objects into Java at JFeeder" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=str base=ExampleObject keyrange=100-200 value=15 valuetype=obj seqid=3 >> JC_3.cmd; echo mput keytype=str base=User keyrange=100-200 value=15 valuetype=usr seqid=4 >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 3 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 3</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 4 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 4</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="verify objects from JFeeder" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=str base=ExampleObject keyrange=100-200 value=15 valuetype=obj seqid=7 >> JC_3.cmd; echo mverify keytype=str base=User keyrange=100-200 value=15 valuetype=usr seqid=8 >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 7 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 7</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 8 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 8</data>
-      <client-set name="JFeeder"/>
-    </task>
-
-    <task name="get and verify at CPP reader for objects created in CPP" action="doVerifyAll" container="userobject" waitTime="15m">
-      <client-set name="Reader"/>
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">0</data>
-    </task>
-    <task name="get and verify at CPP reader for objects created in Java" action="doVerifyAll" container="userobject" waitTime="15m">
-      <client-set name="Reader"/>
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">100</data>
-    </task>
-    <task name="verify objects from java client2" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=str base=ExampleObject keyrange=0-200 value=15 valuetype=obj seqid=5 >> JC_2.cmd; echo mverify keytype=str base=User keyrange=0-200 value=15 valuetype=usr seqid=6 >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="wait for seq 5 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 5</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="wait for seq 6 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 6</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="finalize" container="userobject" waitTime="5m" continueOnError="true">
-      <client-set name="Feeder"/>
-      <client-set name="Reader"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/clientUserObjectKey.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/clientUserObjectKey.xml b/src/tests/cpp/xml/MixedMode/clientUserObjectKey.xml
deleted file mode 100644
index 3040988..0000000
--- a/src/tests/cpp/xml/MixedMode/clientUserObjectKey.xml
+++ /dev/null
@@ -1,164 +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">UserObject</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="className">
-    <list>
-      <item>ExampleObject</item>
-    </list>
-  </data>
-  <data name="keyType">obj</data>
-  <data name="objValue">15</data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="CS" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-  <client-set name="Reader"/>
-  <client-set name="JCC1" hostGroup="CS"/>
-  <client-set name="JCC2" hostGroup="CS"/>
-  <client-set name="JFeeder" hostGroup="CS"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/mixed.jar:\$CLASSPATH MixedMode/csAckMirror.xml</data>
-      <client-set name="CS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 1 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 2 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 3 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 2</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 3</data>
-      <client-set name="JFeeder"/>
-    </task>
-
-    <task name="Init CPP clients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <client-set name="Reader"/>
-    </task>
-
-    <task name="put objects at CPP" action="doPuts" container="userobject" waitTime="10m">
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify objects from java client1" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=obj keyrange=0-100 value=15 valuetype=obj seqid=1 >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="wait seq 1 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 1</data>
-      <client-set name="JCC1"/>
-    </task>
-
-    <task name="put objects into Java at JFeeder" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=obj keyrange=100-200 value=15 valuetype=obj seqid=3 >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 3 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 3</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="verify objects from JFeeder" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=obj keyrange=100-200 value=15 valuetype=obj seqid=7 >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 7 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 7</data>
-      <client-set name="JFeeder"/>
-    </task>
-
-    <task name="get and verify at CPP reader for objects created in CPP" action="doVerifyAll" container="userobject" waitTime="15m">
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Reader"/>
-    </task>
-    <task name="get and verify at CPP reader for objects created in Java" action="doVerifyAll" container="userobject" waitTime="15m">
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Reader"/>
-    </task>
-    <task name="verify objects from java client2" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=obj keyrange=0-200 value=15 valuetype=obj seqid=5 >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="wait for seq 5 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 5</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="finalize" container="userobject" waitTime="5m" continueOnError="true">
-      <client-set name="Feeder"/>
-      <client-set name="Reader"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/csAckMirror.xml b/src/tests/cpp/xml/MixedMode/csAckMirror.xml
deleted file mode 100644
index 5211540..0000000
--- a/src/tests/cpp/xml/MixedMode/csAckMirror.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="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-    <entry>
-      <key><string>1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaclient.ExampleObject</class-name>
-          <parameter name="id"><string>111</string></parameter>
-        </declarable>
-      </value>
-    </entry>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/perfBenchmarkTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/perfBenchmarkTCR.xml b/src/tests/cpp/xml/MixedMode/perfBenchmarkTCR.xml
deleted file mode 100644
index 6ad4bd0..0000000
--- a/src/tests/cpp/xml/MixedMode/perfBenchmarkTCR.xml
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="clientCount">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS" hostGroup="CS"/>
-  <client-set name="JCC1" hostGroup="CS"/>
-  <client-set name="JCC2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native/csAckMirror.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 1 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 2 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 2</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=0-100000 seqid=1 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Gets-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=0-100000 seqid=1 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Gets-identical" action="doGets" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="waitForGetsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForGetsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 1</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Puts-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=0-100000 valuesize=5000 seqid=2 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Puts-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=0-100000 valuesize=5000 seqid=2 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Puts-identical" action="doPuts" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="waitForPutsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 2</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForPutsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 2</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Destroys-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=0-100000 seqid=3 >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Destroys-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=0-100000 seqid=3 >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Destroys-identical" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="waitForDestroysToFinish for client1" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 3</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForDestroysToFinish for client2" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 3</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=0-75000 seqid=4 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Gets-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=25000-100000 seqid=4 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Gets-overlap1" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-overlap2" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="waitForGetsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 4</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForGetsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 4</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Puts-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=0-75000 valuesize=5000 seqid=5 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Puts-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=25000-100000 valuesize=5000 seqid=5 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Puts-overlap1" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-overlap2" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="waitForPutsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 5</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForPutsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 5</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Destroys-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=0-75000 seqid=6 >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Destroys-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=25000-100000 seqid=6 >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Destroys-overlap1" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-overlap2" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="waitForDestroysToFinish for client1" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 6</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForDestroysToFinish for client2" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 6</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=0-50000 seqid=7 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Gets-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=50000-100000 seqid=7 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Gets-non-overlap1" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-non-overlap2" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="waitForGetsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 7</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForGetsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 7</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Puts-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=0-50000 valuesize=5000 seqid=8 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Puts-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=50000-100000 valuesize=5000 seqid=8 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Puts-non-overlap1" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-non-overlap2" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="waitForPutsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 8</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForPutsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 8</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Destroys-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=0-50000 seqid=9 >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Destroys-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=50000-100000 seqid=9 >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Destroys-non-overlap1" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-non-overlap2" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="waitForDestroysToFinish for client1" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 9</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForDestroysToFinish for client2" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 9</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest.xml b/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest.xml
deleted file mode 100644
index 33b9d7b..0000000
--- a/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest.xml
+++ /dev/null
@@ -1,250 +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="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="entryCount">10000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</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="JCS6" hostGroup="CS"/>
-  <client-set name="CSDriver" hostGroup="CSD"/>
-  <client-set name="Feeder"/>
-  <client-set count="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <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" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="StartCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startCSFwk</data>
-      <data name="arguments">--xml=MixedModeCS/clientEventsFailoverQueryTest_CS.xml</data>
-      <data name="background">true</data>
-      <client-set name="CSDriver"/>
-    </task>
-
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="querytests" waitTime="5m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="PopulateRegion /Portfolios/Positions with Position object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">/Portfolios/Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="2h10m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>query</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">30m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">1000</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="3h30m" 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="3h30m" 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="3h30m" 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="3h30m" 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="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="stopStartCacheServer 6" action="doStopStartServer" container="utils" timesToRun="3" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="WaitForCSharp" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneCSharp 1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="querytests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest_CS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest_CS.xml b/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest_CS.xml
deleted file mode 100644
index 7532969..0000000
--- a/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest_CS.xml
+++ /dev/null
@@ -1,113 +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="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="entryCount">10000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set count="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">CPP</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="WaitForPopulate" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="2h10m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>query</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">30m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">1000</data>
-      <data name="objectType">Portfolio</data>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="querytests" waitTime="2m"/>
-    <task name="DoneCSharp" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneCSharp true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest.xml b/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest.xml
deleted file mode 100644
index da00c08..0000000
--- a/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest.xml
+++ /dev/null
@@ -1,208 +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="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="entryCount">10000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</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="JCS6" hostGroup="CS"/>
-  <client-set name="CSDriver" hostGroup="CSD"/>
-  <client-set name="Feeder"/>
-  <client-set count="25" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <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" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="StartCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startCSFwk</data>
-      <data name="arguments">--xml=MixedModeCS/clientEventsQueryTest_CS.xml</data>
-      <data name="background">true</data>
-      <client-set name="CSDriver"/>
-    </task>
-
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="querytests" waitTime="5m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="25" name="Client"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="PopulateRegion /Portfolios/Positions with Position object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">/Portfolios/Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="25" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="1h10m">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>query</item>
-        </oneof>
-      </data>
-      <data name="workTime">1h</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">1000</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-      <client-set count="25" name="Client"/>
-    </task>
-    <task name="WaitForCSharp" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneCSharp 1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest_CS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest_CS.xml b/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest_CS.xml
deleted file mode 100644
index de06869..0000000
--- a/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest_CS.xml
+++ /dev/null
@@ -1,95 +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="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="entryCount">10000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-
-  <client-set count="25" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">CPP</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="25" name="Client"/>
-    </task>
-    <task name="WaitForPopulate" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="1h10m">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>query</item>
-        </oneof>
-      </data>
-      <data name="workTime">1h</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">1000</data>
-      <data name="objectType">Portfolio</data>
-      <client-set count="25" name="Client"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <task name="DoneCSharp" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneCSharp true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-  </test>
-</test-driver>


[46/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


[16/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale058.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale058.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale058.xml
deleted file mode 100644
index 0b22908..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale058.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>4800000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>512</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
- <<data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="bulkOpMapSize">1000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="2" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <<client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale058" description="Clients use bulk ops to create partitioned data on servers. Conserve sockets is false. Limits pool size. Objects are byte arrays of size 512.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/creates.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale059.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale059.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale059.xml
deleted file mode 100644
index ca7cab4..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale059.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="bulkOpMapSize">1000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale059" description="Clients use bulk ops to get partitioned data from servers. Conserve sockets is true. Uses selector. Objects are byte arrays of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1UseSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Get Bulk Entries" action="doGetBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/creategets.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-     <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale060.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale060.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale060.xml
deleted file mode 100644
index a648bbb..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale060.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1600000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
- <<data name="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="bulkOpMapSize">1000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-<client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  <test name="scale060" description="Clients use bulk ops to put partitioned data onto servers. Conserve sockets is false. Uses thread local connections. Objects are DataSerializable PSTObject of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createputs.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale061.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale061.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale061.xml
deleted file mode 100644
index f863414..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale061.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">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaPSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="2" servers="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" cloning-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale061" description="Clients update replicated data on servers. Uses delta propagation with cloningEnabled false. Conserve sockets is true. Uses selector. Limits pool size. Objects are DataSerializable DeltaPSTObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/scale/csDeltaCloningFalseUseSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put Delta Entries in Region" action="doUpdateScaleDeltaData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createupdates.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale062.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale062.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale062.xml
deleted file mode 100644
index c0aed8b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale062.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="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>400000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaFastAssetAccount</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">100000</data>
-  <data name="encodeTimestamp">true</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" servers="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" cloning-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-<client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale062" description="Clients update partitioned data on servers. Uses delta propagation with cloningEnabled false. Conserve sockets is false. Uses selector. Uses thread local connections. Objects are DataSerializable DeltaFastAssetAccounts with Instantiator containing 50 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/scale/csDeltaCloningFalseUseSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put Delta Entries in Region" action="doUpdateScaleDeltaData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createupdates.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale063.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale063.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale063.xml
deleted file mode 100644
index d5431b9..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale063.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">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>360000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">EqStruct</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="2" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="funcName">GetKeyFunction</data>   
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale063" description="Clients use function execution to get replicated data from servers. Conserve sockets is true. Limits pool size. Objects are DataSerializable EqStructs.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/scale/csFEReplicatedRegion.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Get FunctionExecution" action="doGetFunctionExecutionData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/creategets.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale064.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale064.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale064.xml
deleted file mode 100644
index aedbc9b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale064.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>500000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-    <data name="encodeTimestamp">true</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">125000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="funcName">PutKeyFunction</data>   
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale064" description="Clients use function execution to put replicated data from servers. Conserve sockets is false. Uses default connection settings. Objects are DataSerializable FastAssetAccounts with Instantiator containing 50 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/scale/csFEReplicatedRegion.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put FunctionExecution" action="doPutFunctionExecutionData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createputs.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale065.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale065.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale065.xml
deleted file mode 100644
index 71937d3..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale065.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>400000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="encodeTimestamp">true</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">100000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="funcName">GetKeyFunction</data>    
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale065" description="Clients use function execution to get partitioned data from servers. Conserve sockets is true. Uses selector. Objects are DataSerializable FastAssetAccounts with Instantiator containing 50 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/scale/csFEPartitionedRegion.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Get FunctionExecution" action="doGetFunctionExecutionData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/creategets.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale066.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale066.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale066.xml
deleted file mode 100644
index 6caa6f5..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale066.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1200000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-  <data name="funcName">PutKeyFunction</data>    
-  <data name="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="2" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale066" description="Clients use function execution to put partitioned data onto servers. Conserve sockets is false. Uses selector. Limits pool size. Objects are DataSerializable PSTObject of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/scale/csFEPartitionedRegion.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put FunctionExecution" action="doPutFunctionExecutionData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createputs.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale071.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale071.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale071.xml
deleted file mode 100644
index a251425..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale071.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2400000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">25</data>
-  <data name="AssetMaxVal">600000</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,FastAssetAccount"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale071" description="Peer feeds create replicated data on peer datahosts and push updates to clients.  Conserve sockets is true.  Uses selector. Uses thread local connections.  
-  Objects are DataSerializable FastAssetAccounts with Instantiator containing 25 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDackSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale072.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale072.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale072.xml
deleted file mode 100644
index 37ff92c..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale072.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,ArrayOfByte"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  
-  <test name="scale072" description="Peer feeds put replicated data onto peer datahosts and push updates to clients.  Conserve sockets is false.  Uses default connection settings.  Objects are byte arrays of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDack.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-      <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/putupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>


[17/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale047.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale047.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale047.xml
deleted file mode 100644
index 832c4f5..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale047.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2400000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>512</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale047" description="Clients create replicated data on servers. Conserve sockets is true. Uses thread local connections.
-     Objects are DataSerializable PSTObjects of size 512.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDack.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/creates.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale048.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale048.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale048.xml
deleted file mode 100644
index 9e17927..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale048.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1480000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">EqStruct</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale048" description="Clients get replicated data from servers. Conserve sockets is false. Uses selector. Uses thread local connections. 
-  Objects are DataSerializable EqStructs.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDackSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Get Entries" action="doGetDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/creategets.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale049.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale049.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale049.xml
deleted file mode 100644
index b9c30ac..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale049.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">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" servers="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale049" description="Clients put replicated data onto servers. Conserve sockets is true. Uses default connection settings. Objects are byte arrays of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDack.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createputs.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale050.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale050.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale050.xml
deleted file mode 100644
index 95e2cd3..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale050.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="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="encodeTimestamp">true</data>
-  <data name="isUpdateTrim">true</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">250000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" servers="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale050" description="Clients update replicated data on servers. Conserve sockets is false. Uses selector. Objects are DataSerializable FastAssetAccounts with Instantiator containing 50 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDackSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createupdates.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale051.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale051.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale051.xml
deleted file mode 100644
index ae59810..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale051.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>4800000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">EqStructs</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" free-connection-timeout="10000000" read-timeout="10000000" max-connections="2" servers="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale051" description="Clients create partitioned data on servers. Conserve sockets is true. Limits pool size. Objects are DataSerializable EqStructs.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/creates.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale052.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale052.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale052.xml
deleted file mode 100644
index c5704a8..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale052.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="encodeTimestamp">true</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">500000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="2" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale052.xml" description="Clients get partitioned data from servers. Conserve sockets is false. Uses selector. Limits pool size. Objects are DataSerializable FastAssetAccounts with Instantiator containing 50 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1UseSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Get Entries" action="doGetDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/creategets.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale053.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale053.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale053.xml
deleted file mode 100644
index c10a1ac..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale053.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">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" free-connection-timeout="10000000" read-timeout="10000000" servers="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale053" description="Clients put partitioned data onto servers. Conserve sockets is true. Uses default connection settings. Objects are byte arrays of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createputs.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale054.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale054.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale054.xml
deleted file mode 100644
index 6319c14..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale054.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isUpdateTrim">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="2" free-connection-timeout="10000000" read-timeout="10000000" servers="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale054" description="Clients create partitioned data on servers. Conserve sockets is false. Limits pool size. Objects are DataSerializable EqStructs.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createupdates.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale055.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale055.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale055.xml
deleted file mode 100644
index 119518b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale055.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">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2400000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
- <<data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="encodeTimestamp">true</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">25</data>
-  <data name="AssetMaxVal">600000</data>
-  <data name="bulkOpMapSize">1000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  <test name="scale055" description="Clients use bulk ops to create replicated data on servers. Conserve sockets is true. Uses thread local connections. Objects are DataSerializable FastAssetAccounts with Instantiator containing 25 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDack.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/creates.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale056.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale056.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale056.xml
deleted file mode 100644
index 3653bda..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale056.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">EqStruct</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="bulkOpMapSize">1000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="2" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
- <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  <test name="scale056" description="Clients use bulk ops to get replicated data from servers. Conserve sockets is false. Uses selector. Limits pool size. Objects are DataSerializable EqStructs.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDackSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Get Bulk Entries" action="doGetBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/creategets.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale057.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale057.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale057.xml
deleted file mode 100644
index 9319306..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale057.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
- <<data name="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="bulkOpMapSize">1000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="scale057" description="Clients use bulk ops to put replicated data onto servers. Conserve sockets is true. Uses selector. Uses thread local connections. Objects are DataSerializable PSTObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDackSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createputs.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>


[50/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/AppDomainTest/clientEventsHAFailoverAppDomain.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/AppDomainTest/clientEventsHAFailoverAppDomain.xml b/src/tests/cpp/xml/AppDomainTest/clientEventsHAFailoverAppDomain.xml
deleted file mode 100644
index b3b37e9..0000000
--- a/src/tests/cpp/xml/AppDomainTest/clientEventsHAFailoverAppDomain.xml
+++ /dev/null
@@ -1,175 +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="redundancyLevel">2</data>
-  <data name="minServers">2</data>
-  <data name="distinctKeys">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" 
-                    client-notification="true" lru-entries-limit="500"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftest" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <data name="regionSpec">ThinClientRegion</data>
-  <client-set name="Feeder"/>
-  <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="30" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m">
-      <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">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="30" name="Client"/>
-    </task>
-
-    <task name="Register All Keys" action="doRegisterAllKeys" container="cacheserver" waitTime="10m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set count="30" name="Client"/>
-    </task>
-
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="50m" parallel="true">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="cacheserver" waitTime="5m">
-      <data name="appdomain">AppDomainTest</data>
-    </task>
-    <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/AppDomainTest/getAllAppDomainTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/AppDomainTest/getAllAppDomainTest.xml b/src/tests/cpp/xml/AppDomainTest/getAllAppDomainTest.xml
deleted file mode 100644
index d9d04f1..0000000
--- a/src/tests/cpp/xml/AppDomainTest/getAllAppDomainTest.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="expectedCount">100000</data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="150000" 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"/>
-  <client-set name="Subscriber2"/>
-
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-      <data name="appdomain">AppDomainTest</data>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="valueSizes">
-        <list>
-          <item>2000</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests"  timesToRun="3" waitTime="15m" parallel="true">
-      <client-set name="Subscriber"/>
-      <data name="appdomain">AppDomainTest</data>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests"  timesToRun="3" waitTime="15m" parallel="true">
-      <client-set name="Subscriber2"/>
-      <data name="appdomain">AppDomainTest</data>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-      <data name="invalidateRegion">true</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/AppDomainTest/perfClientsUpdateAppDomainTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/AppDomainTest/perfClientsUpdateAppDomainTest.xml b/src/tests/cpp/xml/AppDomainTest/perfClientsUpdateAppDomainTest.xml
deleted file mode 100644
index cc2a9ae..0000000
--- a/src/tests/cpp/xml/AppDomainTest/perfClientsUpdateAppDomainTest.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>1000</item>
-      <item>100</item>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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/csAckMirrorQsize.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="perftests" waitTime="45m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="30m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="perftests" waitTime="45m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="perftests" waitTime="45m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="90m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="perftests" waitTime="45m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/AppDomainTest/putGetAllAppDomainTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/AppDomainTest/putGetAllAppDomainTest.xml b/src/tests/cpp/xml/AppDomainTest/putGetAllAppDomainTest.xml
deleted file mode 100644
index 71a15e2..0000000
--- a/src/tests/cpp/xml/AppDomainTest/putGetAllAppDomainTest.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="expectedCount">100000</data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="150000" 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"/>
-  <client-set name="Subscriber2"/>
-
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPutAll" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPutAll" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <data name="valueSizes">
-        <list>
-          <item>2000</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests"  timesToRun="3" waitTime="15m" parallel="true">
-      <data name="appdomain">AppDomainTest</data>
-      <client-set name="Subscriber"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests"  timesToRun="3" waitTime="15m" parallel="true">
-      <client-set name="Subscriber2"/>
-      <data name="appdomain">AppDomainTest</data>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-      <data name="invalidateRegion">true</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m">
-      <data name="appdomain">AppDomainTest</data>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <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/Bugs/1.0RC1/33104.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33104.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33104.xml
deleted file mode 100755
index c2e7585..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33104.xml
+++ /dev/null
@@ -1,204 +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="minTaskGranularitySec">60</data>
-  <data name="preemptCounter">100</data>
-  <!-- abort, exit, done ops downcounter before execution -->
-  <data name="haltIfBadResult">true</data>
-  <data name="maxRegions">100</data>
-  <data name="installListener">true</data>
-  <data name="installWriter">false</data>
-  <data name="installLoader">false</data>
-  <data name="keySize">
-    <range low="4" high="12"/>
-  </data>
-  <data name="distinctKeys">
-    10000
-  </data>
-  <data name="valueSizes">
-    <range low="0" high="85607"/>
-  </data>
-  <data name="entryOps">
-    <oneof>
-      <item>add</item>
-      <item>add</item>
-      <item>add</item>
-      <item>add</item>
-      <item>add</item>
-      <item>add</item>
-      <item>add</item>
-      <item>add</item>
-      <item>add</item>
-      <item>add</item>
-      <item>add</item>
-      <item>add</item>
-      <item>update</item>
-      <item>update</item>
-      <item>update</item>
-      <!-- <item>abort</item>  seg v -->
-      <!-- <item>exit</item>  exit(0) -->
-      <!-- <item>done</item>  leave doOperation, exit while loop -->
-    </oneof>
-  </data>
-  <data name="opCount">
-    <range low="1" high="10"/>
-  </data>
-
-  <data-set name="AckMirrorNil">
-    <data name="regionName">AckMirrorNil</data>
-    <data name="scope">ack</data>
-    <data name="mirroring">true</data>
-    <data name="interestListEnabled">false</data>
-  </data-set>
-  
-  <data-set name="NackMirrorNil">
-    <data name="regionName">NackMirrorNil</data>
-    <data name="scope">nack</data>
-    <data name="mirroring">true</data>
-    <data name="interestListEnabled">false</data>
-  </data-set>
-  
-  <data-set name="AckMirrorIl">
-    <data name="regionName">AckMirrorIl</data>
-    <data name="scope">ack</data>
-    <data name="mirroring">true</data>
-    <data name="interestListEnabled">true</data>
-  </data-set>
-  
-  <data-set name="NackMirrorIl">
-    <data name="regionName">NackMirrorIl</data>
-    <data name="scope">nack</data>
-    <data name="mirroring">true</data>
-    <data name="interestListEnabled">true</data>
-  </data-set>
-  
-  
-  <test name="33104" description="33104 Bug, Entry Event test">
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionName">MixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>NackMirrorNil</item>
-          <item>AckMirrorNil</item>
-        </oneof>
-      </data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionName">MixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>NackMirrorNil</item>
-          <item>AckMirrorNil</item>
-        </oneof>
-      </data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionName">MixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>NackMirrorNil</item>
-          <item>AckMirrorNil</item>
-        </oneof>
-      </data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionName">MixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>NackMirrorNil</item>
-          <item>AckMirrorNil</item>
-        </oneof>
-      </data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionName">MixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>NackMirrorNil</item>
-          <item>AckMirrorNil</item>
-        </oneof>
-      </data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-   <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">AckMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionSpec">NackMirrorIl</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-      <data name="regionName">MixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>NackMirrorNil</item>
-          <item>AckMirrorNil</item>
-        </oneof>
-      </data>
-    </task>
-  </test>
-    
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33104N.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33104N.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33104N.xml
deleted file mode 100755
index 2015f24..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33104N.xml
+++ /dev/null
@@ -1,204 +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="minTaskGranularitySec">60</data>
-	<data name="preemptCounter">100</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data name="keySize">
-		<range low="4" high="12"/>
-	</data>
-	<data name="distinctKeys">
-		10000
-	</data>
-	<data name="valueSizes">
-		<range low="0" high="85607"/>
-	</data>
-	<data name="entryOps">
-		<oneof>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>update</item>
-			<item>update</item>
-			<item>update</item>
-			<!-- <item>abort</item>  seg v -->
-			<!-- <item>exit</item> 	exit(0) -->
-			<item>done</item>	<!-- leave doOperation, exit while loop -->
-		</oneof>
-	</data>
-	<data name="opCount">
-		<range low="1" high="10"/>
-	</data>
-
-	<data-set name="AckNMirrorNil">
-		<data name="regionName">AckNMirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	
-	<data-set name="NackNMirrorNil">
-		<data name="regionName">NackNMirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	
-	<data-set name="AckNMirrorIl">
-		<data name="regionName">AckNMirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	
-	<data-set name="NackNMirrorIl">
-		<data name="regionName">NackNMirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	
-	
-	<test name="33104N" description="33104N Entry Event test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNMirrorNil</item>
-					<item>AckNMirrorNil</item>
-				</oneof>
-			</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNMirrorNil</item>
-					<item>AckNMirrorNil</item>
-				</oneof>
-			</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNMirrorNil</item>
-					<item>AckNMirrorNil</item>
-				</oneof>
-			</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNMirrorNil</item>
-					<item>AckNMirrorNil</item>
-				</oneof>
-			</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNMirrorNil</item>
-					<item>AckNMirrorNil</item>
-				</oneof>
-			</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">AckNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">NackNMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600" timesToRun="150" continueOnError="true">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNMirrorNil</item>
-					<item>AckNMirrorNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-		
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33122.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33122.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33122.xml
deleted file mode 100755
index a718062..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33122.xml
+++ /dev/null
@@ -1,276 +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="keySize">
-		<range low="4" high="12"/>
-	</data>
-	<data name="valueSizes">
-		<range low="0" high="67105"/>
-	</data>
-	<data name="numThreads">
-		<list>
-			<item>1</item>
-			<item>2</item>
-			<item>3</item>
-			<item>4</item>
-			<item>7</item>
-			<item>10</item>
-		</list>
-	</data>
-	<data name="entryOps">
-		<oneof>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>update</item>
-			<item>invalidate</item>
-			<item>read</item>
-			<item>destroy</item>
-			<item>localInvalidate</item>
-			<item>localDestroy</item>
-			<!-- item>abort</item>  seg v -->
-			<!-- <item>exit</item>	 exit(0) -->
-			<!-- <item>done</item>	 leave doOperation, exit while loop -->
-		</oneof>
-	</data>
-	<data name="opCount">
-		<range low="1" high="10"/>
-	</data>
-	<data name="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">30</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set>
-		<data name="regionName">???</data>
-		<data name="scope">???</data>
-		<data name="mirroring">???</data>
-		<data name="loadFactor">???</data>
-		<data name="statisticsEnabled">???</data>
-		<data name="concurrencyLevel">???</data>
-		<data name="interestListEnabled">???</data>
-		<data name="initialCapacity">???</data>
-		<data name="entryTTLSec">???</data>
-		<data name="entryTTLAction">???</data>
-		<data name="entryIdleTimeoutSec">???</data>
-		<data name="entryIdleTimeoutAction">???</data>
-		<data name="lruEntriesLimit">???</data>
-		<data name="cachingEnabled">???</data>
-		<data name="valueDistLimit">???</data>
-	</data-set>
-	<data-set name="Local">
-		<data name="regionName">Local</data>
-		<data name="scope">local</data>
-	</data-set>
-	<data-set name="AckMirrorNil">
-		<data name="regionName">AckMirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackMirrorNil">
-		<data name="regionName">NackMirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackNmirrorNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckMirrorIl">
-		<data name="regionName">AckMirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackMirrorIl">
-		<data name="regionName">NackMirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="AckNmirrorIl">
-		<data name="regionName">AckNmirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackNmirrorIl">
-		<data name="regionName">NackNmirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackNmirrorNcacheNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-		<data name="cachingEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNcacheNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-		<data name="cachingEnabled">false</data>
-	</data-set>
-	
-	<client-set name="NonDriver">
-		<client name="ClientB"/>
-		<client name="ClientC"/>
-		<client name="ClientD"/>
-		<client name="ClientE"/>
-	</client-set>
-	
-	<client-set name="Driver">
-		<client name="ClientA"/>
-	</client-set>
-	
-	<data name="taskResult">
-		<oneof>
-			<item>pass</item>
-			<item>pass</item>
-			<item>pass</item>
-			<item>fail</item>
-		</oneof>
-	</data>
-	
-	<test name="Local" description="Local Entry Event test" waitTime="780">
-		<task name="CreateReg-LocalA" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackMirrorNil" description="NackMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="AckNmirrorNil" description="AckNmirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackNmirrorNil" description="NackNmirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="AckMirrorIl" description="AckMirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckMirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackMirrorIl" description="NackMirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackMirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="AckNmirrorIl" description="AckNmirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckNmirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackNmirrorIl" description="NackNmirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackNmirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="AckNmirrorNcacheNil" description="AckNmirrorNcacheNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckNmirrorNcacheNil" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackNmirrorNcacheNil" description="NackNmirrorNcacheNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackNmirrorNcacheNil" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="MixedNil" description="MixedNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-MixedNil" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNmirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>AckMirrorNil</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="MixedIl" description="MixedIl Entry Event test" waitTime="780">
-		<task name="CreateRegion-MixedIl" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">MixedIl</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNmirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>AckMirrorIl</item>
-				</oneof>
-			</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33165.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33165.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33165.xml
deleted file mode 100755
index e19bd29..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33165.xml
+++ /dev/null
@@ -1,73 +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="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">30</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set name="Local">
-		<data name="regionName">Local</data>
-		<data name="scope">local</data>
-	</data-set>
-	<data-set name="AckMirrorNil">
-		<data name="regionName">AckMirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackMirrorNil">
-		<data name="regionName">NackMirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackNmirrorNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	
-	<test name="Local" description="Local Entry Event test" waitTime="780">
-		<task name="CreateReg-LocalA" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="15" continueOnError="true">
-			<data name="regionSpec">Local</data>
-		</task>
-	</test>
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="15" continueOnError="true">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="NackMirrorNil" description="NackMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="15" continueOnError="true">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="AckNmirrorNil" description="AckNmirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="15" continueOnError="true">
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorNil" description="NackNmirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="15" continueOnError="true">
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-	</test>
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33165AM.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33165AM.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33165AM.xml
deleted file mode 100755
index bd0628d..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33165AM.xml
+++ /dev/null
@@ -1,27 +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="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">30</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set name="AckMirrorNil">
-		<data name="regionName">AckMirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="50" continueOnError="true">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-	</test>
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33165ANM.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33165ANM.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33165ANM.xml
deleted file mode 100755
index 4ff950c..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33165ANM.xml
+++ /dev/null
@@ -1,25 +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="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">30</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set name="AckNmirrorNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<test name="AckNmirrorNil" description="AckNmirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="50" continueOnError="true">
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-	</test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33165L.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33165L.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33165L.xml
deleted file mode 100755
index 44d0277..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33165L.xml
+++ /dev/null
@@ -1,25 +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="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">30</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set name="Local">
-		<data name="regionName">Local</data>
-		<data name="scope">local</data>
-	</data-set>
-	
-	<test name="Local" description="Local Entry Event test" waitTime="780">
-		<task name="CreateReg-LocalA" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="150" continueOnError="true">
-			<data name="regionSpec">Local</data>
-		</task>
-	</test>
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33165NM.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33165NM.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33165NM.xml
deleted file mode 100755
index 3307af6..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33165NM.xml
+++ /dev/null
@@ -1,25 +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="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">30</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set name="NackMirrorNil">
-		<data name="regionName">NackMirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<test name="NackMirrorNil" description="NackMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="50" continueOnError="true">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-	</test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33165NNM.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33165NNM.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33165NNM.xml
deleted file mode 100755
index 891b68c..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33165NNM.xml
+++ /dev/null
@@ -1,27 +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="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">30</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set name="NackNmirrorNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	
-	<test name="NackNmirrorNil" description="NackNmirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="50" continueOnError="true">
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-	</test>
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33166.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33166.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33166.xml
deleted file mode 100755
index 47ed162..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33166.xml
+++ /dev/null
@@ -1,177 +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="maxTestTime">10200</data>
-	<data name="minTaskGranularitySec">300</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set name="Local">
-		<data name="regionName">Local</data>
-		<data name="scope">local</data>
-	</data-set>
-	<data-set name="AckMirrorNil">
-		<data name="regionName">AckMirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackMirrorNil">
-		<data name="regionName">NackMirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackNmirrorNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckMirrorIl">
-		<data name="regionName">AckMirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackMirrorIl">
-		<data name="regionName">NackMirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="AckNmirrorIl">
-		<data name="regionName">AckNmirrorIl</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackNmirrorIl">
-		<data name="regionName">NackNmirrorIl</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">true</data>
-	</data-set>
-	<data-set name="NackNmirrorNcacheNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-		<data name="cachingEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNcacheNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-		<data name="cachingEnabled">false</data>
-	</data-set>
-	
-	<test name="Local" description="Local Entry Event test" waitTime="780">
-		<task name="CreateReg-LocalA" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">Local</data>
-		</task>
-	</test>
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="NackMirrorNil" description="NackMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="AckNmirrorNil" description="AckNmirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorNil" description="NackNmirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="AckMirrorIl" description="AckMirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckMirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-	</test>
-	
-	<test name="NackMirrorIl" description="NackMirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackMirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-	</test>
-	
-	<test name="AckNmirrorIl" description="AckNmirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckNmirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorIl" description="NackNmirrorIl Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackNmirrorIl" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-	</test>
-	
-	<test name="AckNmirrorNcacheNil" description="AckNmirrorNcacheNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckNmirrorNcacheNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorNcacheNil" description="NackNmirrorNcacheNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackNmirrorNcacheNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-	</test>
-	
-	<test name="MixedNil" description="MixedNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-MixedNil" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNmirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>AckMirrorNil</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="MixedIl" description="MixedIl Entry Event test" waitTime="780">
-		<task name="CreateRegion-MixedIl" action="doCreateRootRegion" container="eventtest" waitTime="60" timesToRun="45" continueOnError="true">
-			<data name="regionName">MixedIl</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNmirrorIl</item>
-					<item>NackMirrorIl</item>
-					<item>AckNmirrorIl</item>
-					<item>AckMirrorIl</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33169.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33169.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33169.xml
deleted file mode 100755
index 8f80cb9..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33169.xml
+++ /dev/null
@@ -1,49 +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="systemName">CSTest</data>
-  <data name="cacheType">PEER</data>
-  <data name="scope">NACK</data>
-
-  <client-set name="All">
-    <client name="ClientF1"></client>
-  </client-set>
-	
-  <test name="ValidateCounts" description="Count distributed events">
-
-    <task name="CreateFeed" action="createCountingProcess" container="libcacheserver" waitTime="60" parallel="true">
-      <data name="cacheType">PEER</data>
-      <data name="regionName">CSRegion</data>
-      <client-set>
-        <client name="ClientF1"></client>
-      </client-set>
-    </task>
-		
-    <task name="CreateServers" action="createCountingProcess" container="libcacheserver" waitTime="60" parallel="true">
-      <data name="cacheType">SERVER</data>
-      <data name="regionName">CSRegion</data>
-      <client-set exclude="true">
-        <client name="ClientF1"></client>
-      </client-set>
-    </task>
-    
-    <task name="CreateFeed" action="createCountingProcess" container="libcacheserver" waitTime="60" parallel="true">
-      <data name="cacheType">PEER</data>
-      <data name="regionName">CSRegion</data>
-      <client-set>
-        <client name="ClientF1"></client>
-      </client-set>
-    </task>
-		
-    <task name="CreateServers" action="createCountingProcess" container="libcacheserver" waitTime="60" parallel="true">
-      <data name="cacheType">SERVER</data>
-      <data name="regionName">CSRegion</data>
-      <client-set exclude="true">
-        <client name="ClientF1"></client>
-      </client-set>
-    </task>
-    
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33183.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33183.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33183.xml
deleted file mode 100755
index 607f816..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33183.xml
+++ /dev/null
@@ -1,67 +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="keySize">
-		<range low="4" high="12"/>
-	</data>
-	<data name="distinctKeys">
-		10000
-	</data>
-	<data name="valueSizes">
-		<range low="20" high="60"/>
-	</data>
-	<data name="numThreads">
-		<list>
-			<item>1</item>
-			<item>2</item>
-			<item>3</item>
-			<item>4</item>
-			<item>7</item>
-			<item>10</item>
-		</list>
-	</data>
-	<data name="entryOps">
-		<oneof>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>update</item>
-			<item>invalidate</item>
-			<item>read</item>
-			<item>destroy</item>
-			<item>localInvalidate</item>
-			<item>localDestroy</item>
-			<!-- item>abort</item>  seg v -->
-			<!-- <item>exit</item>	 exit(0) -->
-			<!-- <item>done</item>	 leave doOperation, exit while loop -->
-		</oneof>
-	</data>
-	<data name="opCount">
-		<range low="1" high="10"/>
-	</data>
-	<data name="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">30</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set name="Local">
-		<data name="regionName">Local</data>
-		<data name="scope">local</data>
-	</data-set>
-	
-	<test name="Local" description="Local Entry Event test" waitTime="780">
-		<task name="CreateReg-LocalA" action="doCreateRootRegion" container="eventtest" waitTime="60">
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/1.0RC1/33192.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/1.0RC1/33192.xml b/src/tests/cpp/xml/Bugs/1.0RC1/33192.xml
deleted file mode 100755
index 608e176..0000000
--- a/src/tests/cpp/xml/Bugs/1.0RC1/33192.xml
+++ /dev/null
@@ -1,80 +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="keySize">
-		<range low="4" high="12"/>
-	</data>
-	<data name="distinctKeys">
-		10000
-	</data>
-	<data name="valueSizes">
-		<range low="0" high="85607"/>
-	</data>
-	<data name="numThreads">
-		<list>
-			<item>1</item>
-			<item>2</item>
-			<item>3</item>
-			<item>4</item>
-			<item>7</item>
-			<item>10</item>
-		</list>
-	</data>
-	<data name="entryOps">
-		<oneof>
-			<item>add</item>
-			<item>add</item>
-			<item>update</item>
-			<item>invalidate</item>
-			<item>read</item>
-			<item>destroy</item>
-			<item>localInvalidate</item>
-			<item>localDestroy</item>
-			<!-- item>abort</item>  seg v -->
-			<!-- <item>exit</item>	 exit(0) -->
-			<!-- <item>done</item>	 leave doOperation, exit while loop -->
-		</oneof>
-	</data>
-	<data name="opCount">
-		<range low="1" high="10"/>
-	</data>
-	<data name="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">300</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">100</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set name="AckMirrorNil">
-		<data name="regionName">AckMirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackMirrorNil">
-		<data name="regionName">NackMirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-AckMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-	
-	<test name="NackMirrorNil" description="NackMirrorNil Entry Event test" waitTime="780">
-		<task name="CreateRegion-NackMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="600"/>
-		<task name="doIterate" action="doIterate" container="eventtest" waitTime="60"/>
-	</test>
-
-</test-driver>


[45/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/DurableClient/durableFailoverR2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durableFailoverR2.xml b/src/tests/cpp/xml/DurableClient/durableFailoverR2.xml
deleted file mode 100644
index 05b4d65..0000000
--- a/src/tests/cpp/xml/DurableClient/durableFailoverR2.xml
+++ /dev/null
@@ -1,257 +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="timedInterval">5m</data>
-  <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">120</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/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="durableclienttests" waitTime="10m">
-      <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="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"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient5"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <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="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" container="durableclienttests" waitTime="5m">
-      <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/DurableClient/durableNonDurableCrash.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durableNonDurableCrash.xml b/src/tests/cpp/xml/DurableClient/durableNonDurableCrash.xml
deleted file mode 100644
index f037500..0000000
--- a/src/tests/cpp/xml/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="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Create Durable Clients" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set name="NDClient1"/>
-      <data name="isDurable">false</data>
-    </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"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Intial Puts" action="doIncrementalPuts" container="durableclienttests" waitTime="30m" >
-      <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 3 4 5</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Intermediate Puts : Cycle 1" action="doIncrementalPuts" container="durableclienttests" waitTime="30m" >
-      <data name="valuestart">10001</data>
-      <data name="valueEnd">20000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 1" action="doDummyTask" container="durableclienttests" waitTime="5m" >
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 1 " action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <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="durableclienttests" waitTime="10m" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 1" action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 1" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <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="durableclienttests" waitTime="30m" >
-      <data name="valuestart">30001</data>
-      <data name="valueEnd">40000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 2" action="doDummyTask" container="durableclienttests" waitTime="5m" >
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 2 " action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <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="durableclienttests" waitTime="10m" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 2" action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 2" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <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="durableclienttests" waitTime="30m" >
-      <data name="valuestart">50001</data>
-      <data name="valueEnd">60000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 3" action="doDummyTask" container="durableclienttests" waitTime="5m" >
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 3 " action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <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="durableclienttests" waitTime="10m" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 3" action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 3" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <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="durableclienttests" waitTime="30m" >
-      <data name="valuestart">70001</data>
-      <data name="valueEnd">80000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 4" action="doDummyTask" container="durableclienttests" waitTime="5m" >
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 4 " action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <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="durableclienttests" waitTime="10m" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 4" action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 4" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <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="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" container="durableclienttests" waitTime="5m">
-      <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/DurableClient/durableNonDurableKAFalse.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durableNonDurableKAFalse.xml b/src/tests/cpp/xml/DurableClient/durableNonDurableKAFalse.xml
deleted file mode 100644
index fbcd22b..0000000
--- a/src/tests/cpp/xml/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="durableclienttests" waitTime="10m">
-      <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="durableclienttests" waitTime="5m">
-      <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="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"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient4"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <data name="valueEnd">100000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC 1 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Close Cycle for NDC 1" action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <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/DurableClient/durableNonDurableKATrue.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durableNonDurableKATrue.xml b/src/tests/cpp/xml/DurableClient/durableNonDurableKATrue.xml
deleted file mode 100644
index dee69b9..0000000
--- a/src/tests/cpp/xml/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="durableclienttests" waitTime="10m">
-      <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="durableclienttests" waitTime="5m">
-      <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="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"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient4"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <data name="valueEnd">100000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC 1 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Close Cycle for NDC 1" action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" container="durableclienttests" waitTime="5m">
-      <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/DurableClient/durableNonDurableTimeout.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durableNonDurableTimeout.xml b/src/tests/cpp/xml/DurableClient/durableNonDurableTimeout.xml
deleted file mode 100644
index 46a2b78..0000000
--- a/src/tests/cpp/xml/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="durableclienttests" waitTime="10m">
-      <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="durableclienttests" waitTime="5m">
-      <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="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"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient4"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-      <client-set name="NDClient3"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <data name="valueEnd">100000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC 1 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <data name="registerType">Regex</data>
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Close Cycle for NDC 1" action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="15m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" container="durableclienttests" waitTime="5m">
-      <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/DurableClient/durablePR/csNotifySubsNoLimit.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePR/csNotifySubsNoLimit.xml b/src/tests/cpp/xml/DurableClient/durablePR/csNotifySubsNoLimit.xml
deleted file mode 100755
index d0767de..0000000
--- a/src/tests/cpp/xml/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/DurableClient/durablePR/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePR/csNotifySubscription.xml b/src/tests/cpp/xml/DurableClient/durablePR/csNotifySubscription.xml
deleted file mode 100644
index 96c2305..0000000
--- a/src/tests/cpp/xml/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/DurableClient/durablePR/durableFailoverR2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePR/durableFailoverR2.xml b/src/tests/cpp/xml/DurableClient/durablePR/durableFailoverR2.xml
deleted file mode 100644
index 2e9ff21..0000000
--- a/src/tests/cpp/xml/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="durableclienttests" waitTime="10m">
-      <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="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" parallel="true">
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m" parallel="true">
-      <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="durableclienttests" waitTime="5m" parallel="true">
-      <data name="registerRegex">.*</data>
-      <data name="isDurableReg">true</data>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m" parallel="true">
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="durableclienttests" waitTime="5m" parallel="true">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">1</data>
-      <client-set name="DClient5"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="durableclienttests" waitTime="5m">
-      <data name="registerRegex">.*</data>
-      <client-set name="DClient6"/>
-    </task>
-    <task name="Incremental Puts" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <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="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient4"/>
-    </task>
-    <task name="Close Cycle for DC 5 " action="doCloseCacheAndReInitialize" container="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="25m" timesToRun="5" parallel="true">
-      <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="durableclienttests" waitTime="5m">
-      <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="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="DClient3"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" container="durableclienttests" waitTime="5m">
-      <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/DurableClient/durablePR/durableNonDurableCrash.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/DurableClient/durablePR/durableNonDurableCrash.xml b/src/tests/cpp/xml/DurableClient/durablePR/durableNonDurableCrash.xml
deleted file mode 100644
index 0f305b6..0000000
--- a/src/tests/cpp/xml/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="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Create Durable Clients" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set name="NDClient1"/>
-      <data name="isDurable">false</data>
-    </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"/>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Intial Puts" action="doIncrementalPuts" container="durableclienttests" waitTime="30m" >
-      <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="durableclienttests" waitTime="30m" >
-      <data name="valuestart">10001</data>
-      <data name="valueEnd">20000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 1" action="doDummyTask" container="durableclienttests" waitTime="5m" >
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 1 " action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <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="durableclienttests" waitTime="10m" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 1" action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 1" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <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="durableclienttests" waitTime="30m" >
-      <data name="valuestart">30001</data>
-      <data name="valueEnd">40000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 2" action="doDummyTask" container="durableclienttests" waitTime="5m" >
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 2 " action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <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="durableclienttests" waitTime="10m" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 2" action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 2" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <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="durableclienttests" waitTime="30m" >
-      <data name="valuestart">50001</data>
-      <data name="valueEnd">60000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 3" action="doDummyTask" container="durableclienttests" waitTime="5m" >
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 3 " action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <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="durableclienttests" waitTime="10m" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 3" action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 3" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <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="durableclienttests" waitTime="30m" >
-      <data name="valuestart">70001</data>
-      <data name="valueEnd">80000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ReStart Client: Cycle 4" action="doDummyTask" container="durableclienttests" waitTime="5m" >
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Reinit DC 1: Cycle 4 " action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <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="durableclienttests" waitTime="10m" parallel="true">
-      <data name="registerType">All</data>
-      <client-set name="DClient2"/>
-    </task>
-    <task name="Reinit NDC 1: Cycle 4" action="doRestartClientAndRegInt" container="durableclienttests" waitTime="10m" parallel="true">
-      <data name="isDurable">false</data>
-      <data name="registerType">All</data>
-      <client-set name="NDClient1"/>
-    </task>
-    <task name="Parrellel Puts: Cycle 4" action="doIncrementalPuts" container="durableclienttests" waitTime="30m"  parallel="true">
-      <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="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-      <client-set name="DClient2"/>
-      <client-set name="NDClient1"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" container="durableclienttests" waitTime="5m">
-      <client-set name="DClient1"/>
-    </task>
-    <task name="Verify" action="doVerifyEventCount" container="durableclienttests" waitTime="5m">
-      <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>


[19/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf077.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf077.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf077.xml
deleted file mode 100644
index f7d6d4b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf077.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="encodeKey">true</data>
-  <data name="encodeTimestamp">true</data>
-  <data name="clientCount">2</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" pool-name="_Test_Pool1">
-        <cache-listener library="smokeperf"  function="createLatencyListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf077" description="Empty edge clients update entries in which they have registered interest on server. 
-   Entries are byte arrays of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf038.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf078.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf078.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf078.xml
deleted file mode 100644
index 2e12f15..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf078.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>102400</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="encodeKey">true</data>
-  <data name="encodeTimestamp">true</data>
-  <data name="clientCount">2</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" pool-name="_Test_Pool1">
-        <cache-listener library="smokeperf" function="createLatencyListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf078" description="Empty edge clients update entries in which they have registered interest on server. 
-   Entries are byte arrays of size 102400.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf038.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf079.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf079.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf079.xml
deleted file mode 100644
index e88fba7..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf079.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>102400</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">2</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" pool-name="_Test_Pool1">
-        <cache-listener library="smokeperf" function="createLatencyListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf079" description="Empty edge clients update entries in which they have registered interest on server. 
-Entries are DataSerializable PSTObjects with byte arrays of size 102400.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf038.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf082.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf082.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf082.xml
deleted file mode 100644
index a147575..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf082.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">4</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" max-connections="8" read-timeout="100000" 
-           subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf082" description="Empty edge clients fetch entries from a partitioned region.  Entries are byte arrays of size 1024. Runs on two hosts.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csPRNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="fetch entries on server" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf020.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf083.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf083.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf083.xml
deleted file mode 100644
index 38e4989..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf083.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">4</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" max-connections="8" read-timeout="100000" 
-           subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf083" description="Empty edge clients update entries in a partitioned region.  Entries are byte arrays of size 1024. Runs on two hosts.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csPRNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf021.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf090.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf090.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf090.xml
deleted file mode 100644
index 4c41551..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf090.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="clientCount">1</data>
-  <data name="contactNum">1</data>
-  <data name="AssetAccountSize">3</data>
-  <data name="AssetMaxVal">10000</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf090" description="Empty edges query entries in partitioned datastore.  Runs on two hosts. Entries are Serializable objects.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/perf/csPRNSFalseForQuery.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Run Query" action="doQueryRegionDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkload">true</data>
-      <data name="query">SELECT DISTINCT acct.acctId, asset.assetId FROM /TestTCR1 acct, acct.assets.values asset WHERE asset.value > 5000.0</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf088.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf091.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf091.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf091.xml
deleted file mode 100644
index 4431d88..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf091.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="clientCount">1</data>
-  <data name="contactNum">1</data>
-  <data name="AssetAccountSize">3</data>
-  <data name="AssetMaxVal">10000</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf091" description="Empty edges query indexed entries in partitioned datastore.  Runs on two hosts. Entries are Serializable objects.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/perf/csPRNSFalseForQueryiWithIndex.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Run Query" action="doQueryRegionDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkload">true</data>
-      <data name="query">SELECT DISTINCT acct.acctId, asset.assetId FROM /TestTCR1 acct, acct.assets.values asset WHERE asset.value > 5000.0</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf088.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf092.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf092.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf092.xml
deleted file mode 100644
index e6325b5..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf092.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="BatchSize">
-    <list>
-      <item>500</item>
-    </list>
-  </data>
-
-  <data name="ObjectType">BatchObject</data>
-  <data name="clientCount">1</data>
-  <data name="contactNum">1</data>
-  <data name="numCQs">1</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" read-timeout="100000" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="Feeder" hostGroup="CS1"/>
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf092" description="Empty edges continuously query entries in partitioned datastore. Entries are Serializable objects.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/perf/csAckMirrorForCq.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,BatchObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,BatchObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,BatchObject"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPutBatchObj" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,BatchObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreate">true</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register continuously Query" action="doRegisterCQs" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,BatchObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="executeWithInitialResults">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doPutBatchObj" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,BatchObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,BatchObject"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,BatchObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf038.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,BatchObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf096.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf096.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf096.xml
deleted file mode 100644
index 27cd18b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf096.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes client-notification="true">
-         <cache-loader library="smokeperf" function="createCacheLoader"/>
-         </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="clientCount">1</data>
-  <data name="regionName">TestTCR1</data>
-  <data name="keepAlive">false</data>
-  <data name="durableTimeout">60</data>
-  <data name="isDurableReg">true</data> 
-
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf096" description="Durable client repeatedly connects and disconnects from a server.  Durable interest is not kept alive.  
-  Measures time to connect and disconnect.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="cycleDurableBridgeConnection" action="doCycleDurableBridgeConnectionTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="6m">
-      <data name="isDurable">true</data>
-      <data name="isMainWorkLoad">true</data>
-      <data name="sleepMs">20</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf097.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf097.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf097.xml
deleted file mode 100644
index 8c8be02..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf097.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes client-notification="true">
-         <cache-loader library="smokeperf" function="createCacheLoader"/>
-         </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="clientCount">1</data>
-  <data name="regionName">TestTCR1</data>
-  <data name="keepAlive">true</data>
-  <data name="durableTimeout">60</data>
-  <data name="isDurableReg">true</data> 
-
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf096" description="Durable client repeatedly connects and disconnects from a server.  Durable interest is not kept alive.  
-  Measures time to connect and disconnect.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="cycleDurableBridgeConnection" action="doCycleDurableBridgeConnectionTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="isDurable">true</data>
-      <data name="isMainWorkLoad">true</data>
-      <data name="sleepMs">20</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf098.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf098.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf098.xml
deleted file mode 100644
index ee68233..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf098.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="opsSecond">100</data>
-  <data name="keyType">str</data>
-  <data name="ObjectType">SizedString</data>
-  <data name="clientCount">1</data>
-  <data name="durableTimeout">600</data>
-  <data name="isDurableReg">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="0" locators="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="smokeperf"  function="createDurableCacheListenerSP"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="poolSpec">ThinClientPool1</data>
-  <client-set name="Feeder" hostGroup="CS1"/>
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf098" description="Cycles between a client putting data to the server and a durable client receiving those updates.  
-  Measures the time it takes the durable client to receive updates.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="putData" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="20m" parallel="true">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="cycleDurableClientTask" action="doCycleDurableClientTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m" parallel="true">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf098.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf100.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf100.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf100.xml
deleted file mode 100644
index 7b06c9c..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf100.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false">
-         <cache-loader library="smokeperf" function="createCacheLoader"/>
-         </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-   <data name="securityScheme">
-     <list>
-       <item>NOOP</item>
-     </list>
-   </data>
-           
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="regionName">TestTCR1</data>
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf100" description="Empty edge clients create and close a region using security authorization scheme noop . 
-   Measures time to connect to server when throttled by 20 ms sleeps ">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t JCS1 smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t JCS2 smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="cycleBridgeConnectionTask" action="doCycleBridgeConnectionTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  parallel="true" waitTime="10m">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="isMainWorkLoad">true</data>
-      <data name="TAG">JCS1</data>
-    </task>
-    <task name="cycleBridgeConnectionTask" action="doCycleBridgeConnectionTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  parallel="true" waitTime="10m">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="isMainWorkLoad">true</data>
-      <data name="TAG">JCS1</data>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf102.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf102.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf102.xml
deleted file mode 100644
index 8ccd75a..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf102.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="1" max-connections="1" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-
-  <data name="disableShufflingEP">true</data>
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf102" description="Edge clients create and close a connection pool using explicit servers.  Does not use selector. 
-    Runs on two hosts.  Measures time to connect to server when throttled by 20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="cyclePoolTask" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="isMainWorkLoad">true</data>
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf103.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf103.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf103.xml
deleted file mode 100644
index a671379..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf103.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="1" max-connections="1"  subscription-redundancy="0" locators="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf103" description="Edge clients create and close a connection pool using autodiscovery.  Does not use selector.  
-    Runs on two hosts.  Measures time to connect to server when throttled by 20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf104.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf104.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf104.xml
deleted file mode 100644
index 0cd6d49..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf104.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="0" subscription-enabled="true" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf104" description="Edge clients create and close a connection pool using explicit servers. Uses selector. 
-    Runs on two hosts. Enables queue. Measures time to connect to server when throttled by 20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalseSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="cyclePoolTask" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="isMainWorkLoad">true</data>
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf105.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf105.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf105.xml
deleted file mode 100644
index 835eb40..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf105.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="0" subscription-enabled="true" subscription-redundancy="0" locators="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf105" description="Edge clients create and close a connection pool using autodiscovery.  Use selector.  
-    Runs on two hosts.  Enables queue. Measures time to connect to server when throttled by 20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorNSFalseSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf106.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf106.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf106.xml
deleted file mode 100644
index 8bb09e4..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf106.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="durableTimeout">60</data>
-  <data name="isDurable">true</data>
-  <data name="keepAlive">false</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="0"  subscription-redundancy="1" servers="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf106" description="Durable client repeatedly creates and closes a connection pool using explicit servers.  
-  Durable interest is not kept alive.  Measures time to connect and disconnect.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>


[25/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csNotifySubscription.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csNotifySubscription.xml
deleted file mode 100644
index cecbdcb..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csNotifySubscription.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csPR.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csPR.xml
deleted file mode 100644
index 7e17a02..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csPR.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="Portfolios">
-    <region-attributes data-policy="partition">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerEviction.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerEviction.xml
deleted file mode 100644
index 6d3e38a..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerEviction.xml
+++ /dev/null
@@ -1,15 +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="Portfolios">
-    <region-attributes scope="distributed-ack">
-      <eviction-attributes>
-        <lru-entry-count maximum="1000"/>
-      </eviction-attributes>
-    </region-attributes>
-      
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerOverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerOverflowToDisk.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerOverflowToDisk.xml
deleted file mode 100644
index 16920c5..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerOverflowToDisk.xml
+++ /dev/null
@@ -1,16 +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" />
-  <pdx persistent="true"/>
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate" persist-backup="true">
-      <eviction-attributes>
-        <lru-entry-count maximum="1000" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-    
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csWithIndex.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csWithIndex.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csWithIndex.xml
deleted file mode 100644
index 28d5dce..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csWithIndex.xml
+++ /dev/null
@@ -1,35 +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" maximum-time-between-pings="600000" />
-  <region name="Portfolios">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index1" type="range" from-clause="/Portfolios" expression="ID" />
-    <index name="index5" type="range" from-clause="/Portfolios.keys" expression="toString" />
-    <!--index name="index7" type="range" from-clause="/Portfolios.values k" expression="nvl(k.position2.toString(),'nopes')"-->
-    <index name="index8" type="range" from-clause="/Portfolios.keys k" expression="k" />
-    <region name="Positions">
-      <region-attributes scope="distributed-ack" data-policy="replicate">
-      </region-attributes>
-    </region>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index2" type="range" from-clause="/Portfolios2" expression="ID" />
-  </region>
-  <region name="Portfolios3">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index3" type="range" from-clause="/Portfolios3" expression="ID" />
-  </region>
-  <region name="Positions">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index4" type="range" from-clause="/Positions" expression="secId" />
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/dataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/dataValidationQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/dataValidationQueryTest.xml
deleted file mode 100644
index cb72441..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/dataValidationQueryTest.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>2</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 Generics/parReg/pdx/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PositionPdx">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PositionPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="1" waitTime="30m" continueOnError="true" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="1" waitTime="30m" continueOnError="true" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/distributedDataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/distributedDataValidationQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/distributedDataValidationQueryTest.xml
deleted file mode 100644
index 572edf2..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/distributedDataValidationQueryTest.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>2</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="client1"/>
-  <client-set name="client2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="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" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="string,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="client1"/>
-      <client-set name="client2"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="client1"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="client1"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="client1"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="client1"/>
-      <client-set name="client2"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PositionPdx">
-      <data name="regionName">Positions</data>
-      <client-set name="client1"/>
-      <data name="objectType">PositionPdx</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="Running Param Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="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" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/entryOperationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/entryOperationQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/entryOperationQueryTest.xml
deleted file mode 100644
index 681e2f4..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/entryOperationQueryTest.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 Generics/parReg/pdx/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>10000</item>
-          <item>500</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>9500</item>
-          <item>475</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/failoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/failoverQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/failoverQueryTest.xml
deleted file mode 100644
index 7c8a640..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/failoverQueryTest.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-	
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  
-  <data name="minServers">1</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-	
-  <test name="QueryFailoverTest" description="Thin Client perf test">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegion" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="3m" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="10" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="1h" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="1h" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="Running Param Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="45m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="45m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <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>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/regexAndQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/regexAndQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/regexAndQueryTest.xml
deleted file mode 100644
index b4ddf3d..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/regexAndQueryTest.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">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="ThinClient1"/>
-  <client-set name="ThinClient2"/>
-
-  <test name="ThinClientRegexNQuery" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQuery/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Populate Entries in ThinClient1" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Gets" action="doGetObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <data name="registerRegex">port.*</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="ThinClient2"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Update Entries from ThinClient1" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-          <item>500</item>
-          <item>1000</item>
-          <item>10000</item>
-        </list>
-      </data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverEvictionQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverEvictionQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverEvictionQueryTest.xml
deleted file mode 100644
index 00142e2..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverEvictionQueryTest.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">Generics/parReg/pdx/RemoteQuery/csServerEviction.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for result set test" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverOverflowToDiskQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverOverflowToDiskQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverOverflowToDiskQueryTest.xml
deleted file mode 100644
index 100f241..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverOverflowToDiskQueryTest.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 Generics/parReg/pdx/RemoteQuery/csServerOverflowToDisk.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsFailoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsFailoverQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsFailoverQueryTest.xml
deleted file mode 100644
index 9b411fb..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsFailoverQueryTest.xml
+++ /dev/null
@@ -1,208 +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="redundancyLevel">1</data>
-  <data name="minServers">4</data>
- 
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="entryCount">1000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  <data name="unsupportedPRQuery">true</data>
-
-  <client-set name="Feeder"/>
-  <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="JCS6" hostGroup="CS"/>
-  <client-set count="30" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 Generics/RemoteQueryPR/csWithOutIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <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" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2h10m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>query</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 5" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="2m" argTypes="String,PortfolioPdx"/>
-    <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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" 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/parReg/pdx/RemoteQueryPR/clientEventsQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsQueryTest.xml
deleted file mode 100644
index d8c44ff..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsQueryTest.xml
+++ /dev/null
@@ -1,141 +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="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="entryCount">1000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  <data name="unsupportedPRQuery">true</data> 
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <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" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-     <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="1h10m" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>query</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <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/parReg/pdx/RemoteQueryPR/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csAckMirror.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csAckMirror.xml
deleted file mode 100644
index 2cc55a7..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csAckMirror.xml
+++ /dev/null
@@ -1,29 +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="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-  <region name="Positions">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-
-</cache> 

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csServerEviction.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csServerEviction.xml
deleted file mode 100644
index 5a266bf..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csServerEviction.xml
+++ /dev/null
@@ -1,69 +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="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-      <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>1</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-             </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml
deleted file mode 100644
index a72f175..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml
+++ /dev/null
@@ -1,41 +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" maximum-time-between-pings="600000" />
-  <region name="IndexRegion">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    
-  </region>
-  <region name="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index1" type="range" from-clause="/Portfolios" expression="ID" />
-    <index name="index5" type="range" from-clause="/Portfolios.keys" expression="toString" />
-    <!--index name="index7" type="range" from-clause="/Portfolios.values k" expression="nvl(k.position2.toString(),'nopes')" -->
-    <index name="index8" type="range" from-clause="/Portfolios.keys k" expression="k" />
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index2" type="range" from-clause="/Portfolios2" expression="ID" />
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index3" type="range" from-clause="/Portfolios3" expression="ID" />
-  </region>
-  <region name="Positions">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index4" type="range" from-clause="/Positions" expression="secId" />
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml
deleted file mode 100644
index aaf1e16..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml
+++ /dev/null
@@ -1,42 +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" maximum-time-between-pings="600000" />
-  <region name="IndexRegion">
-    <!--region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes-->
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-    
-  </region>
-  <region name="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index1" type="range" from-clause="/Portfolios" expression="ID" />
-    <index name="index5" type="range" from-clause="/Portfolios.keys" expression="toString" />
-    <index name="index7" type="range" from-clause="/Portfolios.values k" expression="nvl(k.position2.toString(),'nopes')" />
-    <index name="index8" type="range" from-clause="/Portfolios.keys k" expression="k" />
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index2" type="range" from-clause="/Portfolios2" expression="ID" />
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index3" type="range" from-clause="/Portfolios3" expression="ID" />
-  </region>
-  <region name="Positions">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index4" type="range" from-clause="/Positions" expression="secId" />
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithOutIndexRC2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithOutIndexRC2.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithOutIndexRC2.xml
deleted file mode 100644
index 28f9ad7..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithOutIndexRC2.xml
+++ /dev/null
@@ -1,35 +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" maximum-time-between-pings="600000" />
-  <region name="IndexRegion">
-    <!--region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes-->
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-   
-  </region>
-  <region name="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <region name="Positions">
-    <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/parReg/pdx/RemoteQueryPR/dataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/dataValidationQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/dataValidationQueryTest.xml
deleted file mode 100644
index d7303f6..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/dataValidationQueryTest.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="string,PositionPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PositionPdx">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PositionPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" continueOnError="true" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" continueOnError="true" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>


[06/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/CyberTraderPerfVariableTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/CyberTraderPerfVariableTest2.xml b/src/tests/cpp/xml/Native43/CyberTraderPerfVariableTest2.xml
deleted file mode 100644
index e3e2c1a..0000000
--- a/src/tests/cpp/xml/Native43/CyberTraderPerfVariableTest2.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</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>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="CS1"/>
-  <client-set name="CS2"/>
-  <client-set name="CS3"/>
-  <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" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csAckMirror.xml</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="SetupCacheServer CS3" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS3 Native43/csAckMirror.xml</data>
-      <client-set name="CS3"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="CS2"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegionForPerformanceVariable for Subscriber" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <data name="TAG">CS2</data>
-    </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="45m">
-      <client-set name="Publisher"/>
-      <data name="keyType">int</data>
-    </task>
-
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="perftests" waitTime="30m">
-      <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="15m">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="perftests" waitTime="45m">
-      <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="15m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS3</data>
-      <client-set name="CS3"/>
-    </task>
-
-    <task name="Measure Performance Variable with cache size with 3rd cache member" action="doPuts" container="perftests" waitTime="30m">
-      <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="15m">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size with 3rd cache member" action="doPuts" container="perftests" waitTime="45m">
-      <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="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="StopCacheServers CS3" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="CS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/clientEvents.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/clientEvents.xml b/src/tests/cpp/xml/Native43/clientEvents.xml
deleted file mode 100644
index 6a6542c..0000000
--- a/src/tests/cpp/xml/Native43/clientEvents.xml
+++ /dev/null
@@ -1,90 +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="valueSizes">
-    <list>
-      <item>100000</item>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <client-set count="50" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 Native43/csAckMirror.xml</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-c 6</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="50" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="10m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="10h10m">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10h</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">1000</data>
-      <client-set name="Feeder"/>
-      <client-set count="50" name="Client"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-c 6</data>
-      <client-set name="Feeder"/>
-    </task>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/clientEventsFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/clientEventsFailover.xml b/src/tests/cpp/xml/Native43/clientEventsFailover.xml
deleted file mode 100644
index 031b477..0000000
--- a/src/tests/cpp/xml/Native43/clientEventsFailover.xml
+++ /dev/null
@@ -1,131 +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="valueSizes">
-    <list>
-      <item>100000</item>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <client-set name="JavaCacheServer"/>
-  <client-set count="50" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 Native43/csAckMirror.xml</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-c 6</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="50" name="Client"/>
-    </task>    
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="10m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="2h10m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">2h</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="50" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer" action="doRunProcessAndSleep" container="utils" timesToRun="15" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="program">
-        <oneof>
-          <item>stopJavaServers 1 ; sleep 60 ; startJavaServers 1 </item>
-          <item>stopJavaServers 2 ; sleep 60 ; startJavaServers 2 </item>
-          <item>stopJavaServers 3 ; sleep 60 ; startJavaServers 3 </item>
-          <item>stopJavaServers 4 ; sleep 60 ; startJavaServers 4 </item>
-          <item>stopJavaServers 5 ; sleep 60 ; startJavaServers 5 </item>
-          <item>stopJavaServers 6 ; sleep 60 ; startJavaServers 6 </item>
-          <item>killJavaServers 1 ; sleep 60 ; startJavaServers 1 </item>
-          <item>killJavaServers 2 ; sleep 60 ; startJavaServers 2 </item>
-          <item>killJavaServers 3 ; sleep 60 ; startJavaServers 3 </item>
-          <item>killJavaServers 4 ; sleep 60 ; startJavaServers 4 </item>
-          <item>killJavaServers 5 ; sleep 60 ; startJavaServers 5 </item>
-          <item>killJavaServers 6 ; sleep 60 ; startJavaServers 6 </item>
-          <item>killJavaServers 1 9 ; sleep 60 ; startJavaServers 1 </item>
-          <item>killJavaServers 2 9 ; sleep 60 ; startJavaServers 2 </item>
-          <item>killJavaServers 3 9 ; sleep 60 ; startJavaServers 3 </item>
-          <item>killJavaServers 4 9 ; sleep 60 ; startJavaServers 4 </item>
-          <item>killJavaServers 5 9 ; sleep 60 ; startJavaServers 5 </item>
-          <item>killJavaServers 6 9 ; sleep 60 ; startJavaServers 6 </item>
-        </oneof>
-      </data>
-      <data name="arguments">
-        <list>
-          <item></item>
-        </list>
-      </data>
-      <data name="sleepTime">
-        <oneof>
-          <item>20</item>
-          <item>30</item>
-          <item>40</item>
-          <item>50</item>
-          <item>60</item>
-          <item>90</item>
-          <item>120</item>
-        </oneof>
-      </data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-c 6</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/clientScalabilityMultiServerTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/clientScalabilityMultiServerTest.xml b/src/tests/cpp/xml/Native43/clientScalabilityMultiServerTest.xml
deleted file mode 100755
index 4db5fe9..0000000
--- a/src/tests/cpp/xml/Native43/clientScalabilityMultiServerTest.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="distinctKeysForDestroyTask">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JavaCacheServer"/>
-  <client-set count="1024" name="ThinClient"/>
-
-  <test name="ClientScalabilityTestWith2server" description="ThinClientRegion client scalability tests with 2 server">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native43/csAckMirror.xml</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-c 2</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="3" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="5" count="12" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="17" count="16" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="33" count="32" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="65" count="64" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="129" count="128" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="257" count="256" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="513" count="512" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-c 2</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/clientScalabilityTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/clientScalabilityTest.xml b/src/tests/cpp/xml/Native43/clientScalabilityTest.xml
deleted file mode 100755
index 82cc7f3..0000000
--- a/src/tests/cpp/xml/Native43/clientScalabilityTest.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="distinctKeysForDestroyTask">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JavaCacheServer"/>
-  <client-set count="1024" name="ThinClient"/>
-
-
-  <test name="ClientScalabilityTest" description="ThinClientRegion client scalability tests">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native43/csAckMirror.xml</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="1" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="3" count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="5" count="12" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="17" count="16" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="33" count="32" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="65" count="64" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="129" count="128" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="257" count="256" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set begin="513" count="512" name="ThinClient"/>
-    </task>
-    <task name="Destroys" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/conflationTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/conflationTest.xml b/src/tests/cpp/xml/Native43/conflationTest.xml
deleted file mode 100644
index 8e44c39..0000000
--- a/src/tests/cpp/xml/Native43/conflationTest.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="true" mirroring="false"
-            interest-list-enabled="false" initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csConflationNotifySubscription.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csConflationNotifySubscription.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/csAckMirror.xml b/src/tests/cpp/xml/Native43/csAckMirror.xml
deleted file mode 100644
index fdca041..0000000
--- a/src/tests/cpp/xml/Native43/csAckMirror.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/csAckMirrorConflate.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/csAckMirrorConflate.xml b/src/tests/cpp/xml/Native43/csAckMirrorConflate.xml
deleted file mode 100644
index 19b4768..0000000
--- a/src/tests/cpp/xml/Native43/csAckMirrorConflate.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" enable-conflation="true">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/csConflationNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/csConflationNotifySubscription.xml b/src/tests/cpp/xml/Native43/csConflationNotifySubscription.xml
deleted file mode 100644
index 148a21f..0000000
--- a/src/tests/cpp/xml/Native43/csConflationNotifySubscription.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" enable-conflation="true">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/csNotifySubscription.xml b/src/tests/cpp/xml/Native43/csNotifySubscription.xml
deleted file mode 100644
index 6d8a823..0000000
--- a/src/tests/cpp/xml/Native43/csNotifySubscription.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/csServerEviction.xml b/src/tests/cpp/xml/Native43/csServerEviction.xml
deleted file mode 100644
index 45d5a52..0000000
--- a/src/tests/cpp/xml/Native43/csServerEviction.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/csServerOverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/csServerOverflowToDisk.xml b/src/tests/cpp/xml/Native43/csServerOverflowToDisk.xml
deleted file mode 100644
index 755962b..0000000
--- a/src/tests/cpp/xml/Native43/csServerOverflowToDisk.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" persist-backup="true">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/failoverTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/failoverTest.xml b/src/tests/cpp/xml/Native43/failoverTest.xml
deleted file mode 100644
index f4a69af..0000000
--- a/src/tests/cpp/xml/Native43/failoverTest.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JavaCacheServer"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-	
-  <test name="YAPerfTest" description="Thin Client perf test">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native43/csAckMirror.xml</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-c 2</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="20m" parallel="true">
-      <client-set count="5" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClient"/>
-    </task>
-    <task name="stopStartCacheServer" action="doRunProcessAndSleep" container="utils" timesToRun="3" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="program">
-        <oneof>
-          <item>stopJavaServers 1 ; sleep 60 ; startJavaServers 1</item>
-          <item>stopJavaServers 2 ; sleep 60 ; startJavaServers 2</item>
-          <item>killJavaServers 1 ; sleep 60 ; startJavaServers 1</item>
-          <item>killJavaServers 2 ; sleep 60 ; startJavaServers 2</item>
-          <item>killJavaServers 1 9 ; sleep 60 ; startJavaServers 1</item>
-          <item>killJavaServers 2 9 ; sleep 60 ; startJavaServers 2</item>
-        </oneof>
-      </data>
-      <data name="arguments">
-        <list>
-          <item></item>
-        </list>
-      </data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-c 2</data>
-      <client-set name="JavaCacheServer"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/mixedMode.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/mixedMode.xml b/src/tests/cpp/xml/Native43/mixedMode.xml
deleted file mode 100644
index b3ee50b..0000000
--- a/src/tests/cpp/xml/Native43/mixedMode.xml
+++ /dev/null
@@ -1,49 +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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native43/csAckMirror.xml</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    
-    
-    
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <client-set name="Feeder"/>
-    </task>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/perfBenchmarkTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/perfBenchmarkTCR.xml b/src/tests/cpp/xml/Native43/perfBenchmarkTCR.xml
deleted file mode 100644
index f584ebb..0000000
--- a/src/tests/cpp/xml/Native43/perfBenchmarkTCR.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="clientCount">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native43/csAckMirror.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-identical" action="doGets" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Puts-identical" action="doPuts" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys-identical" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-overlap1" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-overlap2" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-overlap1" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-overlap2" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-overlap1" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-overlap2" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-non-overlap1" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-non-overlap2" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-non-overlap1" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-non-overlap2" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-non-overlap1" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-non-overlap2" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/perfClientsUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/perfClientsUpdateTest.xml b/src/tests/cpp/xml/Native43/perfClientsUpdateTest.xml
deleted file mode 100644
index c82543a..0000000
--- a/src/tests/cpp/xml/Native43/perfClientsUpdateTest.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>1000</item>
-      <item>100</item>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-p \"-J-DCacheClientProxy.MESSAGE_QUEUE_SIZE=15000\" Native43/csAckMirrorConflate.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="6m">
-      <client-set name="JCS"/>
-      <data name="sleepTime">5m</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="30m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="15m">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="45m">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="Update Through Feeder" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/perfCyberTraderLatencyPut.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/perfCyberTraderLatencyPut.xml b/src/tests/cpp/xml/Native43/perfCyberTraderLatencyPut.xml
deleted file mode 100644
index 80eb069..0000000
--- a/src/tests/cpp/xml/Native43/perfCyberTraderLatencyPut.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-      <!--item>1000</item>
-      <item>10000</item>
-      <item>100000</item>
-      <item>184877</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>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="JCS1"/>
-  <client-set name="JCS2"/>
-  <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" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csAckMirror.xml</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <data name="regionSpec">ThinClientRegionListener</data>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="Measure Put doLatencyPuts" action="doLatencyPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <data name="regionSpec">ThinClientRegionListener</data>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="PutEntries" action="doLatencyPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/perfCyberTraderPutGetThroughput.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/perfCyberTraderPutGetThroughput.xml b/src/tests/cpp/xml/Native43/perfCyberTraderPutGetThroughput.xml
deleted file mode 100644
index 2394b11..0000000
--- a/src/tests/cpp/xml/Native43/perfCyberTraderPutGetThroughput.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</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>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-
-  <client-set name="JCS"/>
-  <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" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csAckMirror.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csAckMirror.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Destroys Entries" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <data name="TAG">CS2</data>
-    </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="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/perfTCROverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/perfTCROverflowToDisk.xml b/src/tests/cpp/xml/Native43/perfTCROverflowToDisk.xml
deleted file mode 100644
index e31f779..0000000
--- a/src/tests/cpp/xml/Native43/perfTCROverflowToDisk.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-      <item>1000</item>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csServerOverflowToDisk.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csServerOverflowToDisk.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/perfTCRServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/perfTCRServerEviction.xml b/src/tests/cpp/xml/Native43/perfTCRServerEviction.xml
deleted file mode 100644
index 280f8b4..0000000
--- a/src/tests/cpp/xml/Native43/perfTCRServerEviction.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <!-- item>100</item>
-      <item>1000</item -->
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csServerEviction.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csServerEviction.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set name="Putter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set name="Getter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set name="Destroyer1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="7m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="7m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="7m">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set name="Putter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set name="Getter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set name="Destroyer2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="7m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="7m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="7m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/perfTestPutGetDestroyTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/perfTestPutGetDestroyTCR.xml b/src/tests/cpp/xml/Native43/perfTestPutGetDestroyTCR.xml
deleted file mode 100644
index 04cb3dc..0000000
--- a/src/tests/cpp/xml/Native43/perfTestPutGetDestroyTCR.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <!--item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-             <!--item>5000</item>
-             <item>10000</item-->
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csAckMirror.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csAckMirror.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer1"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer2"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>


[28/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/hct/staticInterestPolicyList.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/hct/staticInterestPolicyList.xml b/src/tests/cpp/xml/Generics/hct/staticInterestPolicyList.xml
deleted file mode 100644
index 67e435e..0000000
--- a/src/tests/cpp/xml/Generics/hct/staticInterestPolicyList.xml
+++ /dev/null
@@ -1,132 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyList" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOpsRI" action="doVerifyRegionContentsAfterOpsRI" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/hct/staticInterestPolicyListLateOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/hct/staticInterestPolicyListLateOps.xml b/src/tests/cpp/xml/Generics/hct/staticInterestPolicyListLateOps.xml
deleted file mode 100644
index 0e9bc23..0000000
--- a/src/tests/cpp/xml/Generics/hct/staticInterestPolicyListLateOps.xml
+++ /dev/null
@@ -1,138 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyListLateOps" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="Register Key List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsBeforeOps" action="doVerifyRegionContentsBeforeOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-      <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/hct/staticInterestPolicySingle.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/hct/staticInterestPolicySingle.xml b/src/tests/cpp/xml/Generics/hct/staticInterestPolicySingle.xml
deleted file mode 100644
index 99c714e..0000000
--- a/src/tests/cpp/xml/Generics/hct/staticInterestPolicySingle.xml
+++ /dev/null
@@ -1,126 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">5000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicySingle" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInteres either with interest policy 
-with single KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register Single keys and verify" action="doRegisterSingleKey" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/hct/staticInterestPolicySingleLateOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/hct/staticInterestPolicySingleLateOps.xml b/src/tests/cpp/xml/Generics/hct/staticInterestPolicySingleLateOps.xml
deleted file mode 100644
index c750e27..0000000
--- a/src/tests/cpp/xml/Generics/hct/staticInterestPolicySingleLateOps.xml
+++ /dev/null
@@ -1,138 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="expectedRegionContents">static_RI_noops_keysValues</data>
-  <data name="entryCount">5000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicySingleLateOps" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with single keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="Register singel Keys" action="doRegisterSingleKey" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsBeforeOps" action="doVerifyRegionContentsBeforeOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m">
-       <client-set count="10" name="Client"/>
-    </task>
-      <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/nativeNightly.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/nativeNightly.list b/src/tests/cpp/xml/Generics/nativeNightly.list
deleted file mode 100644
index 7dc206c..0000000
--- a/src/tests/cpp/xml/Generics/nativeNightly.list
+++ /dev/null
@@ -1,17 +0,0 @@
-Generics/Native/perfBenchmarkTCR.xml
-Generics/Native/perfTCRServerEviction.xml
-Generics/Native/clientEventsFailover.xml # 52
-Generics/Native/failoverTest.xml
-Generics/Native/perfClientsUpdateTest.xml
-Generics/Native/perfTestPutGetDestroyTCR.xml
-Generics/Native/perfTCROverflowToDisk.xml
-Generics/Native/perfTestPutGetDestroy_PartialInterestTCR.xml
-Generics/Native/perfTestPutGetDestroyTCRscaledUp.xml
-Generics/Native/ticket226.xml
-Generics/Native/registerAllKeysTest.xml 
-Generics/Native/registerKeysAndRegexTest.xml
-Generics/Native/registerAndUnregisterRegexTest.xml
-Generics/Native/getAllTest.xml
-Generics/Native/registerAllKeysGIIValueTest.xml
-Generics/Native/putGetAllTest.xml
-Generics/Native/registerKeysAndRegexWithReceiveValue.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/nativeNightlyHA.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/nativeNightlyHA.list b/src/tests/cpp/xml/Generics/nativeNightlyHA.list
deleted file mode 100644
index a8280ed..0000000
--- a/src/tests/cpp/xml/Generics/nativeNightlyHA.list
+++ /dev/null
@@ -1,10 +0,0 @@
-Generics/NativeHA/failoverTestHARedundancyMet.xml
-Generics/NativeHA/failoverTestHARedundancyNotMet.xml
-Generics/NativeHA/mixedRedundancyTestHA.xml
-Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R2.xml
-Generics/NativeHA/clientEventsHAFailover_FullInterest.xml
-Generics/NativeHA/clientEventsHAFailover_PartialInterest.xml
-Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
-Generics/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
-Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S2R1.xml
-Generics/NativeHA/perfTestPutGetDestroy_PartialInterestTCRHA_S3R3.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/nativePR.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/nativePR.list b/src/tests/cpp/xml/Generics/nativePR.list
deleted file mode 100644
index b1ccb87..0000000
--- a/src/tests/cpp/xml/Generics/nativePR.list
+++ /dev/null
@@ -1,7 +0,0 @@
-Generics/NativePR/perfBenchmarkTCR.xml
-Generics/NativePR/clientEventsFailover.xml # 52
-Generics/NativePR/failoverTest.xml
-Generics/NativePR/perfClientsUpdateTest.xml
-Generics/NativePR/perfTestPutGetDestroyTCR.xml
-Generics/NativePR/perfTestPutGetDestroy_PartialInterestTCR.xml
-Generics/NativePR/perfTestPutGetDestroyTCRscaledUp.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/csAckMirror.xml b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/csAckMirror.xml
deleted file mode 100644
index 8a0aa48..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/csAckMirror.xml
+++ /dev/null
@@ -1,43 +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="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-     <region name="Positions">
-       <region-attributes scope="distributed-ack" data-policy="replicate">
-         <eviction-attributes>
-           <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-         </eviction-attributes>
-       </region-attributes>
-     </region>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-  <region name="Portfolios3">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-  <region name="Positions">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableCqFailoverR2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableCqFailoverR2.xml b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableCqFailoverR2.xml
deleted file mode 100644
index e31f822..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableCqFailoverR2.xml
+++ /dev/null
@@ -1,208 +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  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 2.  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="minServers">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="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="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableCqFailoverR2" description="Basic test for durable client failover with cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/pdx/RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx" >
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="25m" timesToRun="15" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <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="JCS2"/>
-    </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="JCS2"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableTimeoutWithCq.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableTimeoutWithCq.xml b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableTimeoutWithCq.xml
deleted file mode 100644
index 00ca5f8..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableTimeoutWithCq.xml
+++ /dev/null
@@ -1,147 +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  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 1.  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="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="DurableTimeOutCqTest" description="Basic test for durable client timeout with cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/CqQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" timesToRun="10" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <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/parReg/pdx/CqQuery/durableWithCqKAFalse.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableWithCqKAFalse.xml b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableWithCqKAFalse.xml
deleted file mode 100644
index f7236b0..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableWithCqKAFalse.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-<!-- Description 
-# Servers  1
-# Clients  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = false
-Details  R = 1.  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">false</data>
-  <data name="durableTimeout">120</data>
-  <data name="restartTime">0</data>
-  <data name="updateReceiveTime">60</data>
-  <data name="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableWithCqKAFalse" description="Basic test for durable client with KA false and cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/CqQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="25m" timesToRun="10" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <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/parReg/pdx/CqQuery/durableWithCqKATrue.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableWithCqKATrue.xml b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableWithCqKATrue.xml
deleted file mode 100644
index b328b53..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/durableWithCqKATrue.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-<!-- Description 
-# Servers  1
-# Clients  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 1.  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">120</data>
-  <data name="restartTime">0</data>
-  <data name="updateReceiveTime">60</data>
-  <data name="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableWithCqKATrue" description="Basic test for durable client with KA true and cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/CqQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">14m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="25m" timesToRun="10" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <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/parReg/pdx/CqQuery/multRegCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/multRegCQOps.xml b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/multRegCQOps.xml
deleted file mode 100644
index 6c35a31..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/multRegCQOps.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="multRegCQOps" description="multi region cq operation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/CqQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/multRegServerFailoverAndCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/multRegServerFailoverAndCQOps.xml b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/multRegServerFailoverAndCQOps.xml
deleted file mode 100644
index fbf842d..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/multRegServerFailoverAndCQOps.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">1</data>
-  
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="multRegServerFailoverAndCQOps" description="multRegServerFailoverAndCQOps test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/CqQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">7m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">PortfolioPdx</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="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/resultSetValidationCQTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/resultSetValidationCQTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/resultSetValidationCQTest.xml
deleted file mode 100644
index 327651e..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/resultSetValidationCQTest.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="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  <data name="cq">true</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="resultSetValidationCQTest" description="result set validation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task> 
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PositionPdx">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PositionPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" continueOnError="true" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>


[04/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/latencyPuts10M.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/latencyPuts10M.xml b/src/tests/cpp/xml/NativeHA/latencyPuts10M.xml
deleted file mode 100644
index d35398a..0000000
--- a/src/tests/cpp/xml/NativeHA/latencyPuts10M.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">
-  <data name="BBName">CacheServer</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">1</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>10485760</item>
-    </list>
-  </data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-           client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-           client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder"/>
-
-
-  <test name="96 client with 10M values" description="Feed latency testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Latency with 3 servers, 32 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 10M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="72" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 24 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 10M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 16 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 10M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 8 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/latencyPuts1K.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/latencyPuts1K.xml b/src/tests/cpp/xml/NativeHA/latencyPuts1K.xml
deleted file mode 100644
index 28195b5..0000000
--- a/src/tests/cpp/xml/NativeHA/latencyPuts1K.xml
+++ /dev/null
@@ -1,268 +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="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>524288</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-           client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-           client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder" hostGroup="CS"/>
-
-
-  <test name="96 client with 1k values" description="Feed latency testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">0</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">1</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="33" count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">2</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="65" count="32" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Latency with 3 servers, 32 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 1k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 24 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 1k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 16 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 1k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 8 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/latencyPuts32K.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/latencyPuts32K.xml b/src/tests/cpp/xml/NativeHA/latencyPuts32K.xml
deleted file mode 100644
index 9b72179..0000000
--- a/src/tests/cpp/xml/NativeHA/latencyPuts32K.xml
+++ /dev/null
@@ -1,268 +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="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>16384</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>32768</item>
-    </list>
-  </data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-            client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-            client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder" hostGroup="CS"/>
-
-
-  <test name="96 client with 32k values" description="Feed latency testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">0</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">1</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="33" count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">2</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="65" count="32" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Latency with 3 servers, 32 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">50</data>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 24 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">50</data>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 16 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">50</data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 8 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">50</data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/latencyPuts5M.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/latencyPuts5M.xml b/src/tests/cpp/xml/NativeHA/latencyPuts5M.xml
deleted file mode 100644
index 97a89b4..0000000
--- a/src/tests/cpp/xml/NativeHA/latencyPuts5M.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">
-  <data name="BBName">CacheServer</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">1</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>5242880</item>
-    </list>
-  </data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-            client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-            client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder" hostGroup="CS"/>
-
-
-  <test name="96 client with 5M values" description="Feed latency testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Latency with 3 servers, 32 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 5M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="72" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 24 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 5M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 16 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 5M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 8 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/latencyPuts8K.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/latencyPuts8K.xml b/src/tests/cpp/xml/NativeHA/latencyPuts8K.xml
deleted file mode 100644
index ffa76bd..0000000
--- a/src/tests/cpp/xml/NativeHA/latencyPuts8K.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">
-  <data name="BBName">CacheServer</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>65536</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>8192</item>
-    </list>
-  </data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-            client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-           client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder" hostGroup="CS"/>
-
-
-  <test name="96 client with 8k values" description="Feed latency testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Latency with 3 servers, 32 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 8k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="72" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 24 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 8k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 16 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 8k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 8 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <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/NativeHA/mixedRedundancyTestHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/mixedRedundancyTestHA.xml b/src/tests/cpp/xml/NativeHA/mixedRedundancyTestHA.xml
deleted file mode 100644
index 9d4cb77..0000000
--- a/src/tests/cpp/xml/NativeHA/mixedRedundancyTestHA.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">7m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="ThinClientHA1"/>
-  <client-set count="10" name="ThinClientHA2"/>
-  <client-set count="10" name="ThinClientHA3"/>
-
-  <test name="TcrHAMixedRedundancy" description="Thin Client HA mixed redundancy test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion1" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClientHA1"/>
-      <data name="redundancyLevel">0</data>
-    </task>
-    <task name="CreateRegion2" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClientHA2"/>
-      <data name="redundancyLevel">1</data>
-    </task>
-    <task name="CreateRegion3" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClientHA3"/>
-      <data name="redundancyLevel">2</data>
-    </task>
-    <task name="Populating Entries" action="doPuts" container="perftests" waitTime="30m">
-      <client-set begin="6" count="1" name="ThinClientHA1"/>
-    </task>
-    <task name="Register Partial Interest List 1" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA1"/>
-    </task>
-    <task name="Register Partial Interest List 2" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA2"/>
-    </task>
-    <task name="Register Partial Interest List 3" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA3"/>
-    </task>
-
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-
-    <task name="Gets1" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="5" name="ThinClientHA1"/>
-    </task>
-    <task name="Gets2" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="5" name="ThinClientHA2"/>
-    </task>
-    <task name="Gets3" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="5" name="ThinClientHA3"/>
-    </task>
-    <task name="Puts1" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClientHA1"/>
-    </task>
-    <task name="Puts2" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClientHA2"/>
-    </task>
-    <task name="Puts3" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClientHA3"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml b/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
deleted file mode 100644
index 0620127..0000000
--- a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml b/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
deleted file mode 100644
index 97bef50..0000000
--- a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <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/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml b/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
deleted file mode 100644
index 6f6c453..0000000
--- a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">3</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>


[22/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency3.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency3.xml b/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency3.xml
deleted file mode 100644
index 404addb..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency3.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
- 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="3" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="minServers">3</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="JCS6" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-
-  <test name="conParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all bridge servers">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 Generics/parReg/tx/csPRRedundency3.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="StartCacheServers" 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="StartCacheServers" 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="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="1" count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-          <item>putAll</item>          
-         </oneof>
-      </data>
-      <data name="workTime">200</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-     <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-    <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="1" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    
-    
-
-  </test>
-
-</test-driver>

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csAckMirror.xml b/src/tests/cpp/xml/Generics/parReg/tx/csAckMirror.xml
deleted file mode 100644
index a1fd1be..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csAckMirror.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" concurrency-checks-enabled="true"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPR.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPR.xml
deleted file mode 100644
index 7e17a02..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPR.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="Portfolios">
-    <region-attributes data-policy="partition">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency1.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency1.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency1.xml
deleted file mode 100644
index bb88e0c..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency1.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 data-policy="partition">
-      <partition-attributes redundant-copies="1"/>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency2.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency2.xml
deleted file mode 100644
index d28c339..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency2.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 data-policy="partition">
-      <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/parReg/tx/csPRRedundency3.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency3.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency3.xml
deleted file mode 100644
index ca5c56b..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency3.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 data-policy="partition">
-      <partition-attributes redundant-copies="3"/>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegion.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegion.xml
deleted file mode 100644
index f81abd4..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegion.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-  <pdx read-serialized="false" ignore-unread-fields="false" persistent="false"/>
-  <region name="TestTCR1">
-    <region-attributes multicast-enabled="false" enable-async-conflation="false" enable-subscription-conflation="false" enable-gateway="false" data-policy="partition" initial-capacity="16" load-factor="0.75" concurrency-level="16" concurrency-checks-enabled="true" statistics-enabled="false" ignore-jta="false" is-lock-grantor="false" disk-synchronous="true" cloning-enabled="false">
-      <region-time-to-live>
-        <expiration-attributes timeout="0" action="invalidate"/>
-      </region-time-to-live>
-      <region-idle-time>
-        <expiration-attributes timeout="0" action="invalidate"/>
-      </region-idle-time>
-      <entry-time-to-live>
-        <expiration-attributes timeout="0" action="invalidate"/>
-      </entry-time-to-live>
-      <entry-idle-time>
-        <expiration-attributes timeout="0" action="invalidate"/>
-      </entry-idle-time>
-      <partition-attributes redundant-copies="0" local-max-memory="216" total-max-memory="2147483647" total-num-buckets="113" recovery-delay="-1" startup-recovery-delay="0"/>
-      <subscription-attributes interest-policy="cache-content"/>
-      <cache-listener>
-        <class-name>javaobject.BridgeEventListener</class-name>
-      </cache-listener>
-    </region-attributes>
-  </region>
-  <function-service/>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegionColo.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegionColo.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegionColo.xml
deleted file mode 100644
index 8aba2a2..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegionColo.xml
+++ /dev/null
@@ -1,32 +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="0"/>
-    </region-attributes>
-  </region>
-  <region name="TestTCR1_1">
-    <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="0" colocated-with="TestTCR1"/>
-    </region-attributes>
-  </region>
-  <region name="TestTCR1_2">
-    <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="0" colocated-with="TestTCR1_1"/>
-    </region-attributes>
-  </region>
-  <region name="TestTCR1_3">
-    <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="0" colocated-with="TestTCR1_2"/>
-    </region-attributes>
-  </region>
-  <region name="TestTCR1_4">
-    <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="0" colocated-with="TestTCR1_3"/>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csReplicateRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csReplicateRegion.xml b/src/tests/cpp/xml/Generics/parReg/tx/csReplicateRegion.xml
deleted file mode 100644
index ed5f268..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csReplicateRegion.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 data-policy="replicate">
-      <!-- partition-attributes redundant-copies="0"/-->
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/functionExecutionHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/functionExecutionHA.xml b/src/tests/cpp/xml/Generics/parReg/tx/functionExecutionHA.xml
deleted file mode 100644
index f553175..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/functionExecutionHA.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="partitionedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion2">
-    <snippet>
-      <region name="replicatedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="useTransactions">true</data>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="functionExecutionHA" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedPR.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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion2</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">partitionedRegion</data>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">replicatedRegion</data>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunctionWithHA" action="doExecuteExceptionHandling" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="20m" continueOnError="true" parallel="true" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>ParitionedRegionFunctionExecution</item>
-          <item>ReplicatedRegionFunctionExecution</item>
-          <item>FireAndForgetFunctionExecution</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/parReg/tx/onRegionFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/onRegionFunctionExecWithOutResult.xml b/src/tests/cpp/xml/Generics/parReg/tx/onRegionFunctionExecWithOutResult.xml
deleted file mode 100644
index fa0106d..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/onRegionFunctionExecWithOutResult.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="useTransactions">true</data>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">false</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithOutResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/parReg/tx/onRegionFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/onRegionFunctionExecWithResult.xml b/src/tests/cpp/xml/Generics/parReg/tx/onRegionFunctionExecWithResult.xml
deleted file mode 100644
index 5758be1..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/onRegionFunctionExecWithResult.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="useTransactions">true</data>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="5" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="5" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="5" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="5" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="5" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="5" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="5" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">2m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/parReg/tx/replicatedRegionExecution.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/replicatedRegionExecution.xml b/src/tests/cpp/xml/Generics/parReg/tx/replicatedRegionExecution.xml
deleted file mode 100644
index d14ee08..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/replicatedRegionExecution.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="useTransactions">true</data>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="replicated">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="replicatedRegionExecution" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedRegion.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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <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/parReg/tx/serialEntryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEvent.xml b/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEvent.xml
deleted file mode 100644
index 8bec516..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEvent.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="useTransactions">true</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEvent" description="doing operations serially">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-          </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="UpdateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">20</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>80</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPR.xml b/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPR.xml
deleted file mode 100644
index c6bb8b5..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPR.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="useTransactions">true</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEvent" description="doing operations serially">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-          </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="UpdateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-          </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">20</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>80</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPRWithRegInterest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPRWithRegInterest.xml b/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPRWithRegInterest.xml
deleted file mode 100644
index c8518b8..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPRWithRegInterest.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</data>
-  <!--data name="keyType">int</data-->
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEventWithRegInterest" description="cq test with register interest">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/tx/csPR.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Register And execute CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="registerAndExecuteCQs">true</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="UpdateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroysKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys">
-      <list>
-        <item>20</item>
-      </list>
-  </data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>80</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,byte[]">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroysKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="destroy region" action="doDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ removed " action="doVerifyCqDestroyed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>


[26/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetFEMerge.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetFEMerge.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetFEMerge.xml
deleted file mode 100644
index 13a0ece..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetFEMerge.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>4</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="serialExecution">true</data>
-  <data name="objectType">PdxVersioned</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-<data name="EmptyClientRegion">
-  <snippet>
-    <region name="TestTCR1">
-      <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-      </region-attributes>
-    </region>
-  </snippet>
-</data>
-                                 
-  <data name="isPdxObject">true</data>
-  <data name="funcName">RegionOperationsFunctionPdx</data>   
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="5" name="Client"/>
-
-  <test name="pdxPutGetFEMerge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test put one version of pdx class from few clients and get from other clients.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/pdx/Pdx/csPRPdxFERegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="int,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="5" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="int,Object"  waitTime="5m">
-      <client-set begin="1" count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-	  <data name="versionNum">1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="int,Object"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
- 	 <!--data name="objectType">PdxVersioned</data-->
-	  <data name="versionNum">2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="int,Object"  waitTime="5m">
-      <client-set begin="5" count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Object" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="DoGetServerKeys" action="doGetServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="5" count="1" name="Client"/>
-    </task>
-    <task name="DoUpdateServerKeys" action="DoUpdateServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="5" count="1" name="Client"/>
-    </task>
-    <task name="Do get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">1</data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="DoGetServerKeys" action="doGetServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="5" count="1" name="Client"/>
-    </task>
-    <task name="DoUpdateServerKeys" action="DoUpdateServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="5" count="1" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="int,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/pdx/Pdx/pdxPutGetMerge.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMerge.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMerge.xml
deleted file mode 100644
index 8c98aa6..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMerge.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>4</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="serialExecution">true</data>
-  <data name="objectType">PdxVersioned</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-<data name="EmptyClientRegion">
-  <snippet>
-    <region name="TestTCR1">
-      <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-      </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 count="4" name="Client"/>
-
-  <test name="pdxPutGetMerge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test put one version of pdx class from few clients and get from other clients.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Generics/parReg/pdx/Pdx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="1" count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-	  <data name="versionNum">1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
- 	 <!--data name="objectType">PdxVersioned</data-->
-	  <data name="versionNum">2</data>
-    </task>
-    <task name="Create Object" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">1</data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/pdx/Pdx/pdxPutGetMergeWithRI.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMergeWithRI.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMergeWithRI.xml
deleted file mode 100644
index 4237f1e..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMergeWithRI.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>4</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="serialExecution">true</data>
-  <data name="objectType">PdxVersioned</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-<data name="EmptyClientRegion">
-  <snippet>
-    <region name="TestTCR1">
-      <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-      </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 count="4" name="Client"/>
-
-  <test name="pdxPutGetMergeWithRI" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test put one version of pdx class from few clients and get from other clients with register interest.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Generics/parReg/pdx/Pdx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="1" count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-	  <data name="versionNum">1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
- 	 <!--data name="objectType">PdxVersioned</data-->
-	  <data name="versionNum">2</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Create Object" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-        </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">1</data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/pdx/Pdx/pdxPutGetPdxInstance.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetPdxInstance.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetPdxInstance.xml
deleted file mode 100644
index e57f00c..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetPdxInstance.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">30</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">2</data>
-  <data name="objectType">PdxType</data>
-  <data name="PdxReadSerialized">true</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-<data name="EmptyClientRegion">
-  <snippet>
-    <region name="TestTCR1">
-      <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-      </region-attributes>
-    </region>
-  </snippet>
-</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="Client"/>
-
-  <test name="pdxPutGetPdxInstance" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test put of pdx class from all clients and get from clientsi and modify the fields of pdx object and verify those field.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/Pdx/csPdxInstance.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-   
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="2" count="1" name="Client"/>
-      <!--data name="regionSpec">ThinClientRegion</data-->
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <!--task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task-->
-    <task name="Create Object" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <client-set begin="2" count="1" name="Client"/>
-    </task>
-    <task name="Do put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <client-set begin="2" count="1" name="Client"/>
-    </task>
-    <task name="ValidatePdxInstance" action="doVerifyAndModifyPdxInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="2" count="1" name="Client"/>
-    </task>
-    <task name="Do put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <client-set begin="2" count="1" name="Client"/>
-    </task>
-    <task name="ValidatePdxInstance" action="doVerifyAndModifyPdxInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionFE.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionFE.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionFE.xml
deleted file mode 100644
index 12d9db6..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionFE.xml
+++ /dev/null
@@ -1,137 +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>1</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="replicated">true</data>
-  <data name="isSkipOps">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" 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>
-
-  <data name="isPdxObject">true</data>
-  <data name="funcName">RegionOperationsFunctionPdx</data>   
-  <client-set name="JCS1" hostGroup="CS"/>
-  <!--client-set name="JCS2" hostGroup="CS"/-->
-  <client-set count="2" name="Client"/>
-   
-  <test name="pdxReplicatedRegionFE" description="This test creates a replicated 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">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/pdx/Pdx/csReplicatedPdxRegion.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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </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="1" 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="2" count="1" 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="2" 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="2" 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="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-    
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" 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="2" name="Client"/>
-    </task>
-    <task name="VerifYRegionContents after doOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-   
-    <task name="DoClearRegion" action="DoClearRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set count="2" name="Client"/>
-    </task>
-     <task name="DoResetImageBB" action="doResetImageBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" 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="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set count="2" 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="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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>
-    
-   
-    
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionRI.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionRI.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionRI.xml
deleted file mode 100644
index 9d3c060..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionRI.xml
+++ /dev/null
@@ -1,153 +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>1</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="replicated">true</data>
-  <data name="isSkipOps">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" pool-name="_Test_Pool1" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="true" pool-name="_Test_Pool1" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <data name="isPdxObject">true</data>
-  <data name="funcName">RegionOperationsFunctionPdx</data>   
-  <client-set name="JCS1" hostGroup="CS"/>
-  <!--client-set name="JCS2" hostGroup="CS"/-->
-  <client-set count="2" name="Client"/>
-
-  <test name="pdxReplicatedRegionExecution" description="This test creates a replicated 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">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/pdx/Pdx/csReplicatedPdxRegion.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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </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="1" 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="2" count="1" 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="2" 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="2" 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="VerifYRegionContents" action="DoVerifyRegionContentsBeforeOpsOnFeederClient" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 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="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task-->
-    <!-->task name="VerifYRegionContents" action="doVerifyRegionContents" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task-->
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" 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="2" name="Client"/>
-    </task>
-    <task name="VerifYRegionContents after doOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-   
-    <task name="DoClearRegion" action="DoClearRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set count="2" name="Client"/>
-    </task>
-     <task name="DoResetImageBB" action="doResetImageBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" 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="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set count="2" 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="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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-->
-   
-    
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialAutoSerializer.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialAutoSerializer.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialAutoSerializer.xml
deleted file mode 100644
index 6768a88..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialAutoSerializer.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="serialExecution">true</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="objectType">AutoSerilizer</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </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 count="4" name="Client"/>
-
-  <test name="serialAutoSerilizer" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test uses serial round robin; the first client
-in the round does a random operation then all other clients in the round
-verify their view of the operation.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Generics/parReg/pdx/Pdx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="1" count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Create Operations" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" parallel="true" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>    
-          <!--item>putAll</item-->             
-         </oneof>
-      </data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/pdx/Pdx/serialNestedPdxOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialNestedPdxOps.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialNestedPdxOps.xml
deleted file mode 100644
index 7d34add..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialNestedPdxOps.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="serialExecution">true</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="objectType">Nested</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </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 count="4" name="Client"/>
-
-  <test name="serialParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test uses serial round robin; the first client
-in the round does a random operation then all other clients in the round
-verify their view of the operation.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Generics/parReg/pdx/Pdx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="1" count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Create Operations" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" parallel="true" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>    
-          <!--item>putAll</item-->             
-         </oneof>
-      </data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/pdx/Pdx/serialParRegBridgePdx.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialParRegBridgePdx.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialParRegBridgePdx.xml
deleted file mode 100644
index 8c16637..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialParRegBridgePdx.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="serialExecution">true</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="numPutAllNewKeys">0</data>
-  <data name="objectType">PdxVersioned</data>
-  <data name="versionNum">1</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </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 count="4" name="Client"/>
-
-  <test name="serialParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test uses serial round robin; the first client
-in the round does a random operation then all other clients in the round
-verify their view of the operation.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Generics/parReg/tx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="1" count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Create Operations" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" parallel="true" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>    
-          <!--item>putAll</item-->             
-         </oneof>
-      </data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/pdx/RemoteQuery/clientEventsFailoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsFailoverQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsFailoverQueryTest.xml
deleted file mode 100644
index 13d95de..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsFailoverQueryTest.xml
+++ /dev/null
@@ -1,206 +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="redundancyLevel">1</data>
-  <data name="minServers">2</data>
- 
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="entryCount">1000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  
-  <client-set name="Feeder"/>
-  <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="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/pdx/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <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" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PositionPdx">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PositionPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2h10m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>query</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <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/parReg/pdx/RemoteQuery/clientEventsQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsQueryTest.xml
deleted file mode 100644
index efed2fe..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsQueryTest.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="entryCount">1000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    
-     <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PositionPdx">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PositionPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="1h" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>query</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <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>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csAckMirror.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csAckMirror.xml
deleted file mode 100644
index 8a0aa48..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csAckMirror.xml
+++ /dev/null
@@ -1,43 +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="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-     <region name="Positions">
-       <region-attributes scope="distributed-ack" data-policy="replicate">
-         <eviction-attributes>
-           <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-         </eviction-attributes>
-       </region-attributes>
-     </region>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-  <region name="Portfolios3">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-  <region name="Positions">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-
-</cache> 


[35/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/regexTestWithFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/regexTestWithFailover.xml b/src/tests/cpp/xml/Generics/Native/regexTestWithFailover.xml
deleted file mode 100644
index f6a28d1..0000000
--- a/src/tests/cpp/xml/Generics/Native/regexTestWithFailover.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="minServers">1</data>
- 
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>5</item>
-      <item>10</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Client1"/>
-  <client-set name="Client2"/>
-
-  <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/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Client1"/>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Client1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Gets Entries in Client2" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Client2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerRegex">AAA*0*1*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Update Entries from Client1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Client1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Client2"/>
-      <data name="registerKeys">104</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Unregister Regex List" action="doUnRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="unregisterRegex">AAA*0*1*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Update Entries from Client1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-      <client-set name="Client1"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Client2"/>
-      <data name="registerKeys">100</data>
-      <data name="valueSizes">100</data>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerRegex">AAA*0*2*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerRegex">AAA*0*3*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Update Entries from Client1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Client1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Client2"/>
-      <data name="registerKeys">109</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/registerAllKeysGIIValueTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/registerAllKeysGIIValueTest.xml b/src/tests/cpp/xml/Generics/Native/registerAllKeysGIIValueTest.xml
deleted file mode 100644
index 4b4887d..0000000
--- a/src/tests/cpp/xml/Generics/Native/registerAllKeysGIIValueTest.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-	
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="getInitialValues">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>300</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">300</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="getInitialValues">true</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">300</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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>
-    <task name="StopCacheServers CS2" 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/Native/registerAllKeysTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/registerAllKeysTest.xml b/src/tests/cpp/xml/Generics/Native/registerAllKeysTest.xml
deleted file mode 100644
index 093df9b..0000000
--- a/src/tests/cpp/xml/Generics/Native/registerAllKeysTest.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="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2h" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2h" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <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/Native/registerAndUnregisterRegexTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/registerAndUnregisterRegexTest.xml b/src/tests/cpp/xml/Generics/Native/registerAndUnregisterRegexTest.xml
deleted file mode 100644
index ad469ac..0000000
--- a/src/tests/cpp/xml/Generics/Native/registerAndUnregisterRegexTest.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="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/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Gets Entries in Subscriber" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerRegex">AAA*0*1*</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">5</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Unregister Regex List" action="doUnRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="unregisterRegex">AAA*0*1*</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">0</data>
-      <data name="valueSizes">100</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" 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" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/registerKeysAndRegexTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/registerKeysAndRegexTest.xml b/src/tests/cpp/xml/Generics/Native/registerKeysAndRegexTest.xml
deleted file mode 100644
index a97d9e8..0000000
--- a/src/tests/cpp/xml/Generics/Native/registerKeysAndRegexTest.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="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/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-     <task name="Populate Entries in publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-       <client-set name="Publisher"/>
-     </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100</data>
-      <data name="keyIndexBegin">300</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100</data>
-      <data name="keyIndexBegin">500</data>
-      <data name="getInitialValues">true</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">100</data>
-      <data name="valueSizes">1000</data>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerRegex">AAA*0*11*</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerRegex">AAA*0*22*</data>
-      <data name="getInitialValues">true</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">104</data>
-      <data name="valueSizes">1000</data>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">208</data>
-      <data name="valueSizes">1000</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">208</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Unregister Regex List" action="doUnRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="unregisterRegex">AAA*0*11*</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">204</data>
-      <data name="valueSizes">100</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" 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" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/registerKeysAndRegexWithReceiveValue.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/registerKeysAndRegexWithReceiveValue.xml b/src/tests/cpp/xml/Generics/Native/registerKeysAndRegexWithReceiveValue.xml
deleted file mode 100644
index bc5410d..0000000
--- a/src/tests/cpp/xml/Generics/Native/registerKeysAndRegexWithReceiveValue.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>40</item>
-    </oneof>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="checkReceiveVal">true</data>
-
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="receiveValueTrue">
-        <region-attributes client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-   <data name="ThinClientRegion2">
-     <snippet>
-       <region name="receiveValueFalse">
-         <region-attributes client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>  
-       </region>
-     </snippet>
-   </data>
-   <data name="ThinClientRegion3">
-     <snippet>
-       <region name="receiveValueNone">
-         <region-attributes client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>  
-       </region>
-     </snippet>
-   </data>
-  <data name="ThinClientRegionDC1">
-    <snippet>
-      <region name="receiveValueTrue">
-        <region-attributes client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListenerDC"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-   <data name="ThinClientRegionDC2">
-     <snippet>
-       <region name="receiveValueFalse">
-         <region-attributes client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListenerDC"/>
-        </region-attributes>  
-       </region>
-     </snippet>
-   </data>
-   <data name="ThinClientRegionDC3">
-     <snippet>
-       <region name="receiveValueNone">
-         <region-attributes client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListenerDC"/>
-        </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="Feeder1"/>
-  <client-set name="Feeder2"/>
-  <client-set name="Feeder3"/>
-  <client-set count="3" name="Client"/>
-  <client-set count="3" name="DurableClient"/>
-
-  <test name="registerKeysAndRegexWithReciveValue.xml" description="Test to check the register interest's receive value feature">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native/csMultiRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion receiveValueTrue" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="3" name="Client"/>
-      <client-set name="Feeder1"/>
-      <data name="regionSpec">ThinClientRegion1</data>
-    </task>
-    <task name="CreateRegion receiveValueTrue for dc" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="3" name="DurableClient"/>
-      <data name="isDurable">true</data>
-      <data name="regionSpec">ThinClientRegionDC1</data>
-    </task>
-    <task name="CreateRegion receiveValueFalse" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="3" name="Client"/>
-      <client-set name="Feeder2"/>
-      <data name="regionSpec">ThinClientRegion2</data>
-    </task>
-    <task name="CreateRegion receiveValueFalse for DC" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="3" name="DurableClient"/>
-      <data name="isDurable">true</data>
-      <data name="regionSpec">ThinClientRegionDC2</data>
-    </task>
-    <task name="CreateRegion receiveValueNone" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="3" name="Client"/>
-      <client-set name="Feeder3"/>
-      <data name="regionSpec">ThinClientRegion3</data>
-    </task>
-    <task name="CreateRegion receiveValueNone for dc" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="3" name="DurableClient"/>
-      <data name="isDurable">true</data>
-      <data name="regionSpec">ThinClientRegionDC3</data>
-    </task>
-    <task name="Register Interest List on receiveValueTrue region" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set count="3" name="Client"/>
-      <data name="regionName">receiveValueTrue</data>
-      <data name="registerKeys">1</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="receiveValue">true</data>
-    </task>
-    <task name="Register Interest List  on receiveValueFalse region" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set count="3" name="Client"/>
-      <data name="regionName">receiveValueFalse</data>
-      <data name="registerKeys">1</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="receiveValue">false</data>
-    </task>
-    <task name="Register Interest List on receiveValueTrue region  For DC" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="2m" argTypes="String,byte[]">
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueTrue</data>
-      <data name="registerKeys">1</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="receiveValue">true</data>
-      <data name="isDurableReg">true</data>
-    </task>
-    <task name="Register Interest List on receiveValueFalse region for DC" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="2m" argTypes="String,byte[]">
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueFalse</data>
-      <data name="registerKeys">1</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="receiveValue">false</data>
-      <data name="isDurableReg">true</data>
-    </task>
-    <task name="Register Regex List on receiveValueTrue region" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set count="3" name="Client"/>
-      <data name="regionName">receiveValueTrue</data>
-       <data name="registerRegex">AAA*0*4*</data>
-      <data name="receiveValue">true</data>
-    </task>
-    <task name="Register Regex List on receiveValueFalse region" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set count="3" name="Client"/>
-      <data name="regionName">receiveValueFalse</data>
-      <data name="registerRegex">AAA*0*4*</data>
-      <data name="receiveValue">false</data>
-    </task>
-    <task name="Register Regex List on receiveValueTrue region for DC" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="2m" argTypes="String,byte[]">
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueTrue</data>
-      <data name="registerRegex">AAA*0*4*</data>
-      <data name="receiveValue">true</data>
-      <data name="isDurableReg">true</data>
-    </task>
-    <task name="Register Regex List on receiveValueFalse region for DC" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" waitTime="2m" argTypes="String,byte[]">
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueFalse</data>
-      <data name="registerRegex">AAA*0*4*</data>
-      <data name="receiveValue">false</data>
-      <data name="isDurableReg">true</data>
-    </task>
-    <task name="Entry Operations" action="doCreateUpdateDestroy" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" timesToRun="200" waitTime="60m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="regionName">receiveValueTrue</data>
-      <client-set name="Feeder1"/>
-    </task>
-    <task name="Entry Operations" action="doCreateUpdateDestroy" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" timesToRun="200" waitTime="60m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="regionName">receiveValueFalse</data>
-      <client-set name="Feeder2"/>
-    </task>
-    <task name="Entry Operations" action="doCreateUpdateDestroy" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" timesToRun="200" waitTime="60m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="regionName">receiveValueNone</data>
-      <client-set name="Feeder3"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="360">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="validate test for receiveValueTrue" action="doValidateBankTest" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="3" name="Client"/>
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueTrue</data>
-      <data name="expectedAfterCreateCount">400</data>
-      <data name="expectedAfterUpdateCount">400</data>
-      <data name="expectedAfterInvalidateCount">0</data>
-      <data name="expectedAfterDestroyCount">400</data>
-    </task>
-    <task name="validate test for receiveValueFalse" action="doValidateBankTest" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="3" name="Client"/>
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueFalse</data>
-      <data name="expectedAfterCreateCount">0</data>
-      <data name="expectedAfterUpdateCount">0</data>
-      <data name="expectedAfterInvalidateCount">800</data>
-      <data name="expectedAfterDestroyCount">400</data>
-    </task>
-    <task name="validate test for receiveValueNone" action="doValidateBankTest" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="3" name="Client"/>
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueNone</data>
-      <data name="expectedAfterCreateCount">0</data>
-      <data name="expectedAfterUpdateCount">0</data>
-      <data name="expectedAfterInvalidateCount">0</data>
-      <data name="expectedAfterDestroyCount">0</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/Native/ticket226.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/ticket226.xml b/src/tests/cpp/xml/Generics/Native/ticket226.xml
deleted file mode 100644
index f117d80..0000000
--- a/src/tests/cpp/xml/Generics/Native/ticket226.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="heapLruLimit">400</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>500</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="clientCount">2</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="JCS" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <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="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/clientEventsHAFailover_FullInterest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/clientEventsHAFailover_FullInterest.xml b/src/tests/cpp/xml/Generics/NativeHA/clientEventsHAFailover_FullInterest.xml
deleted file mode 100644
index d39a657..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/clientEventsHAFailover_FullInterest.xml
+++ /dev/null
@@ -1,168 +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="redundancyLevel">2</data>
-  <data name="minServers">2</data>
-  <data name="distinctKeys">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" 
-                    client-notification="true" lru-entries-limit="500"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="30" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m">
-      <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">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="30" name="Client"/>
-    </task>
-
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <client-set count="30" name="Client"/>
-    </task>
-
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="String,byte[]">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1000</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="50m" parallel="true" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]"/>
-    <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/NativeHA/clientEventsHAFailover_PartialInterest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/clientEventsHAFailover_PartialInterest.xml b/src/tests/cpp/xml/Generics/NativeHA/clientEventsHAFailover_PartialInterest.xml
deleted file mode 100644
index f18e692..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/clientEventsHAFailover_PartialInterest.xml
+++ /dev/null
@@ -1,171 +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="redundancyLevel">2</data>
-  <data name="minServers">1</data>
-  <data name="distinctKeys">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" 
-                      client-notification="true" lru-entries-limit="500"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="30" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m">
-      <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">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="30" name="Client"/>
-    </task>
-
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set count="30" name="Client"/>
-    </task>
-
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="String,byte[]">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="1h10m" parallel="true" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="30" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]"/>
-    <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/NativeHA/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/csAckMirror.xml b/src/tests/cpp/xml/Generics/NativeHA/csAckMirror.xml
deleted file mode 100644
index ba56d41..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/csAckMirror.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/csNackMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/csNackMirror.xml b/src/tests/cpp/xml/Generics/NativeHA/csNackMirror.xml
deleted file mode 100644
index b7511e5..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/csNackMirror.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-no-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/NativeHA/failoverTestHARedundancyMet.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/failoverTestHARedundancyMet.xml b/src/tests/cpp/xml/Generics/NativeHA/failoverTestHARedundancyMet.xml
deleted file mode 100644
index 17af838..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/failoverTestHARedundancyMet.xml
+++ /dev/null
@@ -1,138 +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="redundancyLevel">1</data>
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</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">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientFailoverHARedundancyMet" description="Thin Client HA Failover test with redundancy satisfied">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register Partial Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="Gets" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set count="5" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="1h30m" 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="1h30m" 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="1h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]"/>
-    <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/NativeHA/failoverTestHARedundancyNotMet.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/NativeHA/failoverTestHARedundancyNotMet.xml b/src/tests/cpp/xml/Generics/NativeHA/failoverTestHARedundancyNotMet.xml
deleted file mode 100644
index ff2d1da..0000000
--- a/src/tests/cpp/xml/Generics/NativeHA/failoverTestHARedundancyNotMet.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">
-
-  <data name="redundancyLevel">3</data>
-
-  <data name="timedInterval">10m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientFailoverHARedundancyNotMet" description="Thin Client HA Failover test with redundancy not satisfied">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <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">
-      <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">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register Partial Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="Gets" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set count="5" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]"/>
-    <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>


[21/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventWithRegInterest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventWithRegInterest.xml b/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventWithRegInterest.xml
deleted file mode 100644
index 66e096d..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventWithRegInterest.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</data>
-  <!--data name="keyType">int</data-->
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEventWithRegInterest" description="cq test with register interest">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/CqQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Register And execute CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="registerAndExecuteCQs">true</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="UpdateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroysKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys">
-      <list>
-        <item>10</item>
-      </list>
-  </data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>90</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,byte[]">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroysKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="destroy region" action="doDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ removed " action="doVerifyCqDestroyed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/serialParRegBridge.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serialParRegBridge.xml b/src/tests/cpp/xml/Generics/parReg/tx/serialParRegBridge.xml
deleted file mode 100644
index ccbd0de..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serialParRegBridge.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">200</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="serialExecution">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <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 count="4" name="Client"/>
-
-  <test name="serialParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test uses serial round robin; the first client
-in the round does a random operation then all other clients in the round
-verify their view of the operation.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/tx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="1" count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>    
-          <item>putAll</item>             
-         </oneof>
-      </data>
-      <data name="workTime">10</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/tx/serialParRegBridge1.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serialParRegBridge1.xml b/src/tests/cpp/xml/Generics/parReg/tx/serialParRegBridge1.xml
deleted file mode 100644
index e12d8c0..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serialParRegBridge1.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">200</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="serialExecution">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <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 count="4" name="Client"/>
-
-  <test name="serialParRegBridge1" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test uses serial round robin; the first client
-in the round does a random operation then all other clients in the round
-verify their view of the operation. All empty client">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/tx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item> 
-          <item>putAll</item>        
-         </oneof>
-      </data>
-      <data name="workTime">10</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/tx/serialParRegBridge2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serialParRegBridge2.xml b/src/tests/cpp/xml/Generics/parReg/tx/serialParRegBridge2.xml
deleted file mode 100644
index 6f2bac5..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serialParRegBridge2.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">200</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="serialExecution">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <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 count="4" name="Client"/>
-
-  <test name="serialParRegBridge2" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test uses serial round robin; the first client
-in the round does a random operation then all other clients in the round
-verify their view of the operation. All normal client">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/tx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-          <item>putAll</item>         
-         </oneof>
-      </data>
-      <data name="workTime">10</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/tx/serverFailoverAndCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serverFailoverAndCQOps.xml b/src/tests/cpp/xml/Generics/parReg/tx/serverFailoverAndCQOps.xml
deleted file mode 100644
index e01bc26..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serverFailoverAndCQOps.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serverFailoverAndCQOps" description="failover test with single region">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">7m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyAllKeys.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyAllKeys.xml b/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyAllKeys.xml
deleted file mode 100644
index 5b12e38..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyAllKeys.xml
+++ /dev/null
@@ -1,133 +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>5</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyAllKeys" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with ALL_KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </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="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOpsRI" action="doVerifyRegionContentsAfterOpsRI" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-   <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/parReg/tx/staticInterestPolicyAllKeysLateOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyAllKeysLateOps.xml b/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyAllKeysLateOps.xml
deleted file mode 100644
index 2c27b46..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyAllKeysLateOps.xml
+++ /dev/null
@@ -1,138 +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>5</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyAllKeysLateOps" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with ALL_KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </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="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsBeforeOps" action="doVerifyRegionContentsBeforeOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-      <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/parReg/tx/staticInterestPolicyList.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyList.xml b/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyList.xml
deleted file mode 100644
index c218a38..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyList.xml
+++ /dev/null
@@ -1,133 +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>5</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyList" description="In a client VM/bridge server configuration, one client VM loads data into the
-region, which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOpsRI" action="doVerifyRegionContentsAfterOpsRI" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/parReg/tx/staticInterestPolicyListLateOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyListLateOps.xml b/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyListLateOps.xml
deleted file mode 100644
index 58dcc07..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicyListLateOps.xml
+++ /dev/null
@@ -1,139 +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>5</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyListLateOps" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="Register Key List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsBeforeOps" action="doVerifyRegionContentsBeforeOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-      <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/parReg/tx/staticInterestPolicySingle.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicySingle.xml b/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicySingle.xml
deleted file mode 100644
index 972621d..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicySingle.xml
+++ /dev/null
@@ -1,127 +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>5</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">5000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicySingle" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with single KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register Single keys and verify" action="doRegisterSingleKey" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/parReg/tx/staticInterestPolicySingleLateOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicySingleLateOps.xml b/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicySingleLateOps.xml
deleted file mode 100644
index 50739ef..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/staticInterestPolicySingleLateOps.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>5</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</data>
-  <data name="getInitialValues">true</data>
-  <data name="expectedRegionContents">static_RI_noops_keysValues</data>
-  <data name="entryCount">5000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicySingleLateOps" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with single keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="Register singel Keys" action="doRegisterSingleKey" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsBeforeOps" action="doVerifyRegionContentsBeforeOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m">
-       <client-set count="10" name="Client"/>
-    </task>
-      <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/pdx.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/pdx.list b/src/tests/cpp/xml/Generics/pdx.list
deleted file mode 100644
index 6e0b981..0000000
--- a/src/tests/cpp/xml/Generics/pdx.list
+++ /dev/null
@@ -1,32 +0,0 @@
-Generics/parReg/pdx/RemoteQuery/dataValidationQueryTest.xml
-Generics/parReg/pdx/RemoteQuery/distributedDataValidationQueryTest.xml
-Generics/parReg/pdx/RemoteQuery/entryOperationQueryTest.xml
-Generics/parReg/pdx/RemoteQuery/failoverQueryTest.xml
-Generics/parReg/pdx/RemoteQuery/clientEventsQueryTest.xml
-Generics/parReg/pdx/RemoteQuery/clientEventsFailoverQueryTest.xml
-Generics/parReg/pdx/RemoteQuery/regexAndQueryTest.xml
-Generics/parReg/pdx/RemoteQuery/serverEvictionQueryTest.xml
-Generics/parReg/pdx/RemoteQuery/serverOverflowToDiskQueryTest.xml
-Generics/parReg/pdx/RemoteQueryPR/dataValidationQueryTest.xml
-Generics/parReg/pdx/RemoteQueryPR/distributedDataValidationQueryTest.xml
-Generics/parReg/pdx/RemoteQueryPR/entryOperationQueryTest.xml
-Generics/parReg/pdx/RemoteQueryPR/failoverQueryTest.xml
-Generics/parReg/pdx/RemoteQueryPR/clientEventsQueryTest.xml
-Generics/parReg/pdx/RemoteQueryPR/clientEventsFailoverQueryTest.xml
-Generics/parReg/pdx/RemoteQueryPR/regexAndQueryTest.xml
-Generics/parReg/pdx/RemoteQueryPR/serverEvictionQueryTest.xml
-Generics/parReg/pdx/CqQuery/serialEntryEvent.xml
-Generics/parReg/pdx/CqQuery/resultSetValidationCQTest.xml
-Generics/parReg/pdx/CqQuery/singleRegCQOps.xml
-Generics/parReg/pdx/CqQuery/serverFailoverAndCQOps.xml
-Generics/parReg/pdx/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
-Generics/parReg/pdx/CqQuery/multRegServerFailoverAndCQOps.xml
-Generics/parReg/pdx/CqQuery/multRegCQOps.xml
-Generics/parReg/pdx/CqQuery/durableWithCqKAFalse.xml
-Generics/parReg/pdx/CqQuery/durableWithCqKATrue.xml
-Generics/parReg/pdx/CqQuery/durableCqFailoverR2.xml
-Generics/parReg/pdx/CqQuery/durableTimeoutWithCq.xml
-Generics/parReg/pdx/tx/serialEntryEvent.xml
-Generics/parReg/pdx/tx/serialEntryEventPR.xml
-Generics/parReg/pdx/tx/serverFailoverAndCQOps.xml
-Generics/parReg/pdx/tx/singleRegCQOps.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/pdxNtx.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/pdxNtx.list b/src/tests/cpp/xml/Generics/pdxNtx.list
deleted file mode 100644
index a86d680..0000000
--- a/src/tests/cpp/xml/Generics/pdxNtx.list
+++ /dev/null
@@ -1,23 +0,0 @@
-Generics/parReg/tx/serialParRegBridge1.xml
-Generics/parReg/tx/serialParRegBridge2.xml
-Generics/parReg/tx/conParRegBridge.xml
-Generics/parReg/tx/conParRegBridge1.xml
-Generics/parReg/tx/conParRegBridge2.xml
-Generics/parReg/tx/colocatedTxBridge.xml
-Generics/parReg/tx/serialParRegBridge.xml
-Generics/parReg/pdx/Pdx/pdxPRRegionOps.xml
-Generics/parReg/pdx/Pdx/pdxReplicatedRegionRI.xml
-Generics/parReg/pdx/Pdx/pdxReplicatedRegionFE.xml
-Generics/parReg/pdx/Pdx/pdxPersistentRegionFE.xml
-Generics/parReg/pdx/Pdx/pdxPRRegionFE.xml
-Generics/parReg/pdx/Pdx/pdxPutGetFEMerge.xml
-Generics/parReg/pdx/Pdx/serialParRegBridgePdx.xml
-Generics/parReg/pdx/Pdx/serialNestedPdxOps.xml
-Generics/parReg/pdx/Pdx/pdxPutGetMerge.xml
-Generics/parReg/pdx/Pdx/pdxPutGetMergeWithRI.xml
-Generics/parReg/pdx/Pdx/pdxPutGetPdxInstance.xml
-Generics/parReg/pdx/Pdx/pdxInstanceFactoryTest.xml
-Generics/parReg/pdx/Pdx/pdxFailover.xml
-Generics/parReg/pdx/Pdx/serialAutoSerializer.xml
-Generics/parReg/pdx/Pdx/concAutoSerializer.xml
-


[43/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/csFEPartitionedRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csFEPartitionedRegion.xml b/src/tests/cpp/xml/FunctionExecution/csFEPartitionedRegion.xml
deleted file mode 100644
index dd8c30f..0000000
--- a/src/tests/cpp/xml/FunctionExecution/csFEPartitionedRegion.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="dummy">
-    <region-attributes  data-policy="normal">
-    </region-attributes>
-    <entry>
-      <key><string>1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.PSTObject</class-name>
-          <parameter name="field1">
-            <string>1</string>
-          </parameter>
-        </declarable>
-      </value>
-    </entry>
-  </region>
-  <region name="TestTCR1">
-     <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="1" total-num-buckets="10"/>
-     </region-attributes>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.GetKeyFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.PutKeyFunction</class-name>
-    </function>
-   
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/csPartitionRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csPartitionRegion.xml b/src/tests/cpp/xml/FunctionExecution/csPartitionRegion.xml
deleted file mode 100755
index 7726866..0000000
--- a/src/tests/cpp/xml/FunctionExecution/csPartitionRegion.xml
+++ /dev/null
@@ -1,32 +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"/>
-  <pdx read-serialized="true" />
-  <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>
-      <class-name>javaobject.RegionOperationsFunctionOptimized</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.RegionOperationsFunctionOptimizedFalse</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/csPartitionRegionForFEHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csPartitionRegionForFEHA.xml b/src/tests/cpp/xml/FunctionExecution/csPartitionRegionForFEHA.xml
deleted file mode 100755
index f1bd69b..0000000
--- a/src/tests/cpp/xml/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/FunctionExecution/csReplicatedPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csReplicatedPR.xml b/src/tests/cpp/xml/FunctionExecution/csReplicatedPR.xml
deleted file mode 100755
index 9039139..0000000
--- a/src/tests/cpp/xml/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>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/csReplicatedRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csReplicatedRegion.xml b/src/tests/cpp/xml/FunctionExecution/csReplicatedRegion.xml
deleted file mode 100755
index 9dbd07b..0000000
--- a/src/tests/cpp/xml/FunctionExecution/csReplicatedRegion.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="replicate">
-    </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/FunctionExecution/exceptionHandling.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/exceptionHandling.xml b/src/tests/cpp/xml/FunctionExecution/exceptionHandling.xml
deleted file mode 100644
index 438e19e..0000000
--- a/src/tests/cpp/xml/FunctionExecution/exceptionHandling.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-  	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">2</data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="partitionedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion2">
-    <snippet>
-      <region name="replicatedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-  <data name="isExcpHnd">true</data>
-	
-  <test name="exceptionHandling" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedPR.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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion2</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">partitionedRegion</data>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">replicatedRegion</data>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteExceptionHandling" action="doExecuteExceptionHandling" container="functionExecution" waitTime="20m" continueOnError="true" parallel="true">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>ParitionedRegionFunctionExecution</item>
-          <item>ReplicatedRegionFunctionExecution</item>
-          <item>FireAndForgetFunctionExecution</item>
-          <item>OnServersFunctionExcecution</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/functionExecutionHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/functionExecutionHA.xml b/src/tests/cpp/xml/FunctionExecution/functionExecutionHA.xml
deleted file mode 100644
index 49d6073..0000000
--- a/src/tests/cpp/xml/FunctionExecution/functionExecutionHA.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="partitionedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion2">
-    <snippet>
-      <region name="replicatedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="functionExecutionHA" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedPR.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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion2</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">partitionedRegion</data>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">replicatedRegion</data>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunctionWithHA" action="doExecuteExceptionHandling" container="functionExecution" waitTime="20m" continueOnError="true" parallel="true">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>ParitionedRegionFunctionExecution</item>
-          <item>ReplicatedRegionFunctionExecution</item>
-          <item>FireAndForgetFunctionExecution</item>
-          <item>OnServersFunctionExcecution</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/nonPRFunctionExecuteTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/nonPRFunctionExecuteTest.xml b/src/tests/cpp/xml/FunctionExecution/nonPRFunctionExecuteTest.xml
deleted file mode 100644
index de66b48..0000000
--- a/src/tests/cpp/xml/FunctionExecution/nonPRFunctionExecuteTest.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="replicated">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="nonPRFunctionExecuteTest" description="Testing function execution APIs">
-    <task name="setupCacheServers 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="setupCacheServers 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csEmptyDataPolicy.xml</data>
-      <client-set name="JCS2"/>
-    </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="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onRegionFunctionExecHAWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecHAWithResult.xml b/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecHAWithResult.xml
deleted file mode 100644
index f6f0d62..0000000
--- a/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecHAWithResult.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>30000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <client-set name="Feeder"/>
-  <data name="minServers">2</data>
-  <data name="getResult">true</data>
-  <data name="isResultCollector">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegionForFEHA.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="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctionsHA" container="functionExecution" parallel="true" waitTime="25m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="1" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="1" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="1" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onRegionFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecWithOutResult.xml b/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecWithOutResult.xml
deleted file mode 100644
index a9ab73d..0000000
--- a/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecWithOutResult.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">false</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithOutResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onRegionFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecWithResult.xml b/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecWithResult.xml
deleted file mode 100644
index 5e01a94..0000000
--- a/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecWithResult.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onServerFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onServerFunctionExecWithOutResult.xml b/src/tests/cpp/xml/FunctionExecution/onServerFunctionExecWithOutResult.xml
deleted file mode 100644
index da6ce24..0000000
--- a/src/tests/cpp/xml/FunctionExecution/onServerFunctionExecWithOutResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">false</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServer</data>
-	
-  <test name="onServerFunctionExecWithOutResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>get</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onServerFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onServerFunctionExecWithResult.xml b/src/tests/cpp/xml/FunctionExecution/onServerFunctionExecWithResult.xml
deleted file mode 100644
index dd7c3c3..0000000
--- a/src/tests/cpp/xml/FunctionExecution/onServerFunctionExecWithResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServer</data>
-	
-  <test name="onServerFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>get</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onServersFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onServersFunctionExecWithOutResult.xml b/src/tests/cpp/xml/FunctionExecution/onServersFunctionExecWithOutResult.xml
deleted file mode 100644
index e07da56..0000000
--- a/src/tests/cpp/xml/FunctionExecution/onServersFunctionExecWithOutResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">false</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServers</data>
-	
-  <test name="onServersFunctionExecWithOutResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onServersFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onServersFunctionExecWithResult.xml b/src/tests/cpp/xml/FunctionExecution/onServersFunctionExecWithResult.xml
deleted file mode 100644
index 82842a8..0000000
--- a/src/tests/cpp/xml/FunctionExecution/onServersFunctionExecWithResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServers</data>
-	
-  <test name="onServersFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -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="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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/replicatedRegionExecution.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/replicatedRegionExecution.xml b/src/tests/cpp/xml/FunctionExecution/replicatedRegionExecution.xml
deleted file mode 100644
index e2d8a2d..0000000
--- a/src/tests/cpp/xml/FunctionExecution/replicatedRegionExecution.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="replicated">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="replicatedRegionExecution" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedRegion.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="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="functionExecution" waitTime="2m"/>
-    <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/CqQuery/concCQMTTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/concCQMTTest.xml b/src/tests/cpp/xml/Generics/CqQuery/concCQMTTest.xml
deleted file mode 100644
index 9709ca5..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/concCQMTTest.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-   <list>
-     <item>10000</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-   <list>
-     <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-   <list>
-     <item>6</item>
-   </list>
-  </data>
-  <data name="keyType">int</data>
-  <data name="clientCnt">3</data>
-  <data name="serverCount">2</data>
-  <data name="cqtest">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
- <client-set name="JCS1" hostGroup="CS"/>
- <client-set name="JCS2" hostGroup="CS"/>
- <client-set count="3" name="Client"/>
- <client-set name="Feeder"/>
-
- <test name="conCQBridge" description="Test CQ with a variety of operations with careful validation and concurrent execution ,with multiple threads">
-   <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-     <data name="program">setupJavaServers</data>
-     <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH hct/csAckMirror.xml</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-     <data name="program">startJavaServers</data>
-     <data name="arguments">1</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-     <data name="regionName">TestTCR1</data>
-     <data name="regionSpec">ThinClientRegion</data>
-     <client-set count="3" name="Client"/>
-     <client-set name="Feeder"/>
-   </task>
-   <task name="Register All keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="2m">
-     <client-set count="3" name="Client"/>
-   </task>
-   <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="20m">
-     <client-set name="Feeder"/>
-     <client-set count="1" name="Client"/>
-   </task>
-   <task name="LoadRegion" action="doFeedInt" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="20m">
-     <client-set name="Feeder"/>
-   </task>
-   <task name="Register CQ with executeWithIR " action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-     <data name="query">
-       <list>
-         <item>select * from /TestTCR1</item>
-       </list>
-     </data>
-     <client-set count="3" name="Client"/>
-  </task>
-  <task name="verify queryResults" action="doVerifyQueryResult" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="5m">
-    <data name="query">
-      <list>
-        <item>select * from /TestTCR1</item>
-      </list>
-    </data>
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="DoOperations in concurrent fashion" action="doRROps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="10m">
-    <data name="query">
-      <list>
-        <item>select * from /TestTCR1</item>
-      </list>
-    </data>
-    <client-set count="1" name="Client"/>
-  </task>
-  <task name="validate entry events against the listener count" action="doValidateEvents" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m"/>
-  <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-    <data name="program">stopJavaServers</data>
-    <data name="arguments">1</data>
-    <client-set name="JCS1"/>
-  </task>
-  <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-    <data name="program">stopJavaServers</data>
-    <data name="arguments">2</data>
-    <client-set name="JCS2"/>
-  </task>
- </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/cqDurableQS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/cqDurableQS.xml b/src/tests/cpp/xml/Generics/CqQuery/cqDurableQS.xml
deleted file mode 100644
index de305c2..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/cqDurableQS.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-   <list>
-     <item>100</item>
-   </list>
-  </data>
-
-  <data name="valueSizes">
-   <list>
-     <item>100</item>
-   </list>
-  </data>
-
-  <data name="keyType">int</data>
-
- <!--Default Values for this test only-->
- <data name="isDurable">true</data>
- <data name="keepAlive">true</data>
- <data name="durableTimeout">120</data>
- <data name="updateReceiveTime">60</data>
- <data name="registerAndExecuteCQs">true</data>
- <data name="executeWithIR">false</data>
- <data name="cq">true</data>
- <data name="invalidate">true</data>
-
-<data name="ThinClientRegion">
-  <snippet>
-    <region name="dummyRegion">
-      <region-attributes caching-enabled="true" client-notification="true">
-      </region-attributes>
-    </region>
-  </snippet>
-</data>
-<data name="regionSpec">ThinClientRegion</data>
-<client-set name="JCS1" hostGroup="CS"/>
-<client-set name="JCS2" hostGroup="CS"/>
-<client-set name="Feeder"/>
-<client-set name="DClient1"/>
-<client-set name="NDClient1"/>
-
-<test name="CqDurableQS" description="Test for testing Cq and Query Service for durable and non durable clients,along with event based validation .">
-  <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-    <data name="program">setupJavaServers</data>
-    <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <data name="regionName">dummyRegion</data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <client-set name="DClient1"/>
-</task>
-<task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <data name="regionName">dummyRegion</data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="isDurable">false</data>
-  <client-set name="NDClient1"/>
-</task>
-<task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <data name="regionName">dummyRegion</data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <client-set name="Feeder"/>
-</task>
-<task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="DClient1"/>
-  <data name="isDurableReg">true</data>
-</task>
-<task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="NDClient1"/>
-</task>
-<task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="DClient1"/>
-  <data name="isDurableC">true</data>
-  <data name="query">
-    <list>
-      <item>select * from /dummyRegion</item>
-    </list>
-   </data>
-</task>
-<task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="NDClient1"/>
-  <data name="isDurableC">false</data>
-  <data name="query">
-    <list>
-      <item>select * from /dummyRegion</item>
-    </list>
-  </data>
-</task>
-<!--task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <data name="cqState">stopped</data>
-  <client-set name="NDClient1"/>
-  <client-set  name="DClient1"/>
-</task>
-<task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,Portfolio" waitTime="15m" parallel="true">
-  <data name="entryOps">
-    <oneof>
-      <item>add</item>
-      <item>add</item>
-    </oneof>
-  </data>
-  <data name="workTime">2m</data>
-  <data name="opsSecond">5</data>
-  <data name="entryCount">100</data>
-  <data name="valueSizes">100</data>
-  <data name="regionName">dummyRegion</data>
-  <data name="objectType">Portfolio</data>
-  <client-set name="Feeder"/>
-</task>
-<task name="Validate CQs for DC" action="doValidateCq" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="DClient1"/>
-  <data name="isDurableC">true</data>
-</task>
-<task name="Validate CQs for NDC" action="doValidateCq" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="NDClient1"/>
-  <data name="isDurableC">false</data>
-</task>
-<task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set  name="DClient1"/>
-  <client-set name="NDClient1"/>
-  <data name="checkEvents">true</data>
-  <data name="stopped">true</data>
-</task>
-<task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <data name="cqState">execute</data>
-  <client-set name="NDClient1"/>
-  <client-set  name="DClient1"/>
-</task-->
-<task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,Portfolio" waitTime="15m" parallel="true">
-  <data name="entryOps">
-    <oneof>
-      <item>add</item>
-       <item>invalidate</item>
-      <item>add</item>
-    </oneof>
-  </data>
-  <data name="workTime">3m</data>
-  <data name="opsSecond">5</data>
-  <data name="entryCount">100</data>
-  <data name="valueSizes">100</data>
-  <data name="regionName">dummyRegion</data>
-  <data name="objectType">Portfolio</data>
-  <client-set name="Feeder"/>
-</task>
-<task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
- <client-set  name="DClient1"/>
- <client-set name="NDClient1"/>
- <data name="checkEvents">true</data>
- <data name="execute">true</data>
-</task>
-<task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m"/>
-<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/CqQuery/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/csAckMirror.xml b/src/tests/cpp/xml/Generics/CqQuery/csAckMirror.xml
deleted file mode 100644
index cecbdcb..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/csAckMirror.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/durableCqFailoverR2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/durableCqFailoverR2.xml b/src/tests/cpp/xml/Generics/CqQuery/durableCqFailoverR2.xml
deleted file mode 100644
index 3651b00..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/durableCqFailoverR2.xml
+++ /dev/null
@@ -1,208 +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  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 2.  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="minServers">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="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="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableCqFailoverR2" description="Basic test for durable client failover with cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio" >
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="25m" timesToRun="15" parallel="true" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" 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="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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="JCS2"/>
-    </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="JCS2"/>
-    </task>
-  </test>
-</test-driver>


[42/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/durableTimeoutWithCq.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/durableTimeoutWithCq.xml b/src/tests/cpp/xml/Generics/CqQuery/durableTimeoutWithCq.xml
deleted file mode 100644
index 7e90fa7..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/durableTimeoutWithCq.xml
+++ /dev/null
@@ -1,147 +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  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 1.  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="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="DurableTimeOutCqTest" description="Basic test for durable client timeout with cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" timesToRun="10" parallel="true" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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/CqQuery/durableWithCqKAFalse.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKAFalse.xml b/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKAFalse.xml
deleted file mode 100644
index 829d022..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKAFalse.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-<!-- Description 
-# Servers  1
-# Clients  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = false
-Details  R = 1.  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">false</data>
-  <data name="durableTimeout">120</data>
-  <data name="restartTime">0</data>
-  <data name="updateReceiveTime">60</data>
-  <data name="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableWithCqKAFalse" description="Basic test for durable client with KA false and cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="25m" timesToRun="10" parallel="true" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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/CqQuery/durableWithCqKATrue.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKATrue.xml b/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKATrue.xml
deleted file mode 100644
index a695c5f..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKATrue.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-<!-- Description 
-# Servers  1
-# Clients  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 1.  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">120</data>
-  <data name="restartTime">0</data>
-  <data name="updateReceiveTime">60</data>
-  <data name="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableWithCqKATrue" description="Basic test for durable client with KA true and cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="2" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">2m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="25m" timesToRun="10" parallel="true" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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/CqQuery/multRegCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/multRegCQOps.xml b/src/tests/cpp/xml/Generics/CqQuery/multRegCQOps.xml
deleted file mode 100644
index 157f8b4..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/multRegCQOps.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="multRegCQOps" description="multi region cq operation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/resultSetValidationCQTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/resultSetValidationCQTest.xml b/src/tests/cpp/xml/Generics/CqQuery/resultSetValidationCQTest.xml
deleted file mode 100644
index f407c7f..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/resultSetValidationCQTest.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="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  <data name="cq">true</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="resultSetValidationCQTest" description="result set validation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Position">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task> 
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Position">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" continueOnError="true" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/serialCQMTTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/serialCQMTTest.xml b/src/tests/cpp/xml/Generics/CqQuery/serialCQMTTest.xml
deleted file mode 100644
index 6e745d3..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/serialCQMTTest.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-   <list>
-     <item>10000</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-   <list>
-     <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-   <list>
-     <item>6</item>
-   </list>
-  </data>
-  <data name="keyType">int</data>
-
-  <!-- clientCnt and serverCount attributes are needed to run the test in serial RR fashion -->
-  <data name="clientCnt">3</data>
-  <data name="serverCount">2</data>
-
-  <data name="serialExecution">true</data>
-  <data name="cqtest">true</data>
-  <data name="executeWithIR">true</data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
- <client-set name="JCS1" hostGroup="CS"/>
- <client-set name="JCS2" hostGroup="CS"/>
- <client-set count="3" name="Client"/>
- <client-set name="Feeder"/>
-
- <test name="serialCQBridge" description="Test CQ with a variety of operations with careful validation and serial round-robin execution ,with multiple threads">
-   <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-     <data name="program">setupJavaServers</data>
-     <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH hct/csAckMirror.xml</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-     <data name="program">startJavaServers</data>
-     <data name="arguments">1</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-     <data name="regionName">TestTCR1</data>
-     <data name="regionSpec">ThinClientRegion</data>
-     <client-set count="3" name="Client"/>
-     <client-set name="Feeder"/>
-   </task>
-   <task name="Register All keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="2m">
-     <client-set count="3" name="Client"/>
-   </task>
-   <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="20m">
-    <client-set name="Feeder"/>
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="LoadRegion" action="doFeedInt" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="20m">
-    <client-set name="Feeder"/>
-  </task>
-  <task name="Register CQ with executeWithIR " action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-    <data name="query">
-      <list>
-        <item>select * from /TestTCR1</item>
-      </list>
-    </data>
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="DoOperations in serial RR fashion" action="doRROps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="10m">
-    <data name="query">
-      <list>
-         <item>select * from /TestTCR1</item>
-      </list>
-    </data>
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="validate entry events against the listener count" action="doValidateEvents" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m"/>
-  <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-    <data name="program">stopJavaServers</data>
-    <data name="arguments">1</data>
-    <client-set name="JCS1"/>
-  </task>
-  <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-    <data name="program">stopJavaServers</data>
-    <data name="arguments">2</data>
-    <client-set name="JCS2"/>
-  </task>
- </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/serialEntryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/serialEntryEvent.xml b/src/tests/cpp/xml/Generics/CqQuery/serialEntryEvent.xml
deleted file mode 100644
index 63860a8..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/serialEntryEvent.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEvent" description="doing operations serially">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="UpdateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>50</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-          <item>45</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>50</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml b/src/tests/cpp/xml/Generics/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
deleted file mode 100644
index 1254b24..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/serialMultRegOpsCQListenerWithFeeder.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">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-  <data name="cq">true</data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-    </list>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialMultRegOpsCQListenerWithFeeder" description="cq with multiregion test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>1000</item>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-          <item>1000</item>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>1000</item>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">1m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

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


[27/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialEntryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialEntryEvent.xml b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialEntryEvent.xml
deleted file mode 100644
index 3feb7e7..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialEntryEvent.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEvent" description="doing operations serially">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/CqQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="UpdateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>50</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-          <item>45</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>50</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
deleted file mode 100644
index 604475f..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialMultRegOpsCQListenerWithFeeder.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">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-  <data name="cq">true</data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-    </list>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialMultRegOpsCQListenerWithFeeder" description="cq with multiregion test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/CqQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>1000</item>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-          <item>1000</item>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>1000</item>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">1m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/concAutoSerializer.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/concAutoSerializer.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/concAutoSerializer.xml
deleted file mode 100644
index 9d1706e..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/concAutoSerializer.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="objectType">AutoSerilizer</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </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 count="4" name="Client"/>
-
-  <test name="concAutoSerializer" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test uses serial round robin; the first client
-in the round does a random operation then all other clients in the round
-verify their view of the operation.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Generics/parReg/pdx/Pdx/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="1" count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Create Operations" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" parallel="true" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>    
-          <!--item>putAll</item-->             
-         </oneof>
-      </data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-    <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-      <client-set begin="1" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/pdx/Pdx/csPRPdxFERegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPRPdxFERegion.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPRPdxFERegion.xml
deleted file mode 100644
index 911e800..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPRPdxFERegion.xml
+++ /dev/null
@@ -1,16 +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"/>
-  <pdx read-serialized="true" />
-  <region name="TestTCR1">
-    <region-attributes data-policy="partition"/>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.RegionOperationsFunctionPdx</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPartitionRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPartitionRegion.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPartitionRegion.xml
deleted file mode 100755
index a087a58..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPartitionRegion.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 data-policy="partition">
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPdxInstance.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPdxInstance.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPdxInstance.xml
deleted file mode 100644
index 584dd54..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPdxInstance.xml
+++ /dev/null
@@ -1,13 +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"/>
-  <pdx read-serialized="true" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <!--partition-attributes redundant-copies="1"/-->
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPersistentRgn.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPersistentRgn.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPersistentRgn.xml
deleted file mode 100755
index ab9aeb1..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPersistentRgn.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-  <cache-server port="$PORT_NUM"/>
-  <pdx persistent="true" read-serialized="true"/>
-
-  <!-- define a region to hold portfolio objects -->
-  <region name="TestTCR1">
-    <region-attributes data-policy="persistent-replicate"/>
-  </region>
-  <function-service>
-  <function>
-    <class-name>javaobject.RegionOperationsFunctionPdx</class-name>
-  </function>
-</function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csReplicatedPdxRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csReplicatedPdxRegion.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csReplicatedPdxRegion.xml
deleted file mode 100644
index f490ce4..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csReplicatedPdxRegion.xml
+++ /dev/null
@@ -1,16 +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"/>
-  <pdx read-serialized="true" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.RegionOperationsFunctionPdx</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxFailover.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxFailover.xml
deleted file mode 100644
index 9ef7df6..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxFailover.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
- <data name="sleepTime">
-   <oneof>
-     <item>40</item>
-     <item>50</item>
-     <item>60</item>
-     <item>90</item>
-   </oneof>
- </data>
- <data name="operation">
-   <oneof>
-     <item>stop</item>
-     <item>term</item>
-     <item>kill</item>
-   </oneof>
- </data>
-  <data name="minServers">2</data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="objectType">PdxVersioned</data>
-  <data name="versionNum">1</data>
-  
-
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-
-  <test name="pdxFailover" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. In the test clients do random operation where at same time timily stop start server are triggered.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/tx/csPRRedundency1.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Create Operations" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" parallel="true" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>    
-          <!--item>putAll</item-->             
-         </oneof>
-      </data>
-      <client-set count="4" name="Client"/>
-    </task>
-   <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-     <data name="ServerId">1</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-     <data name="ServerId">2</data>
-     <client-set name="JCS2"/>
-   </task>
-   <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-     <data name="ServerId">3</data>
-     <client-set name="JCS3"/>
-   </task>
-   <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-     <data name="ServerId">4</data>
-     <client-set name="JCS4"/>
-   </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="5m" argTypes="String,Object">
-    <client-set begin="4" count="1" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-  <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-    <client-set count="4" name="Client"/>
-  </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxInstanceFactoryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxInstanceFactoryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxInstanceFactoryTest.xml
deleted file mode 100644
index 5285a09..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxInstanceFactoryTest.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="PdxReadSerialized">true</data>
-  <data name="clientCount">2</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="objectType">PdxInstanceFactory</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" function="createSilenceListenerPdx"/>
-        </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 count="2" name="Client"/>
-
-  <test name="pdxInstanceFactoryTest" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all VMs. The test uses serial round robin; the first client
-in the round does a random operation then all other clients in the round
-verify their view of the operation.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Generics/parReg/pdx/Pdx/csPdxInstance.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <!--task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task-->
-    <task name="Create Operations" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="ValidatePdxInstance" action="doVerifyAndModifyPdxInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set  begin="2" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-     <task name="ValidatePdxInstance" action="doVerifyAndModifyPdxInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set  begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/parReg/pdx/Pdx/pdxPRRegionFE.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionFE.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionFE.xml
deleted file mode 100644
index b4370e0..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionFE.xml
+++ /dev/null
@@ -1,124 +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>1</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" subscription-enabled="true" thread-local-connections="false" min-connections="2" 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>
-
-
-  <data name="isPdxObject">true</data>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-  <data name="funcName">RegionOperationsFunctionPdx</data>    
-
-  <test name="pdxPRRegionFE" 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 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/pdx/Pdx/csPRPdxFERegion.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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="3" 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="1" 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="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-     <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="versionNum">1</data>
-      <client-set begin="3" count="1" name="Client"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Register All keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="int,object">
-      <client-set begin="1" count="2" 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="2" count="1" 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="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set count="2" 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="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="3" count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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>
-    
-    
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionOps.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionOps.xml
deleted file mode 100644
index fb1765f..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionOps.xml
+++ /dev/null
@@ -1,113 +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>1</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" subscription-enabled="true" thread-local-connections="false" min-connections="2" 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 count="2" name="Client"/>
-<data name="funcName">RegionOperationsFunctionPdx</data>    
-  <test name="pdxPRRegionOps" 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">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/pdx/Pdx/csPRPdxFERegion.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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </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="1" 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="2" count="1" 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="2" 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="2" 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="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" 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="2" name="Client"/>
-    </task>
-    <task name="VerifYRegionContents after doOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-    <task name="DoGetServerKeys" action="doGetServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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>
-     
-    
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPersistentRegionFE.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPersistentRegionFE.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPersistentRegionFE.xml
deleted file mode 100644
index c1665a7..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPersistentRegionFE.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="numThreads">
-    <list>
-      <item>1</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" subscription-enabled="true" thread-local-connections="false" min-connections="2" 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>
-
-  <data name="isPdxObject">true</data>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-  <data name="funcName">RegionOperationsFunctionPdx</data>   
-
-  <test name="pdxPersistentRegionFE" 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 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/pdx/Pdx/csPersistentRgn.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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="3" 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="1" 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="2" count="1" name="Client"/>
-      <data name="versionNum">2</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="3" count="1" name="Client"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-       <client-set count="2" 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="2" 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="2" count="1" 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="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set count="2" 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="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="3" count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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>
-    
-    
-  </test>
-</test-driver>


[48/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/32152.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/32152.xml b/src/tests/cpp/xml/Bugs/32152.xml
deleted file mode 100755
index d3a6ee9..0000000
--- a/src/tests/cpp/xml/Bugs/32152.xml
+++ /dev/null
@@ -1,1598 +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="entries">10</data>
-
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorIl">
-    <snippet>
-      <region name="AckMirrorIl">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorIl">
-    <snippet>
-      <region name="NackMirrorIl">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorIl">
-    <snippet>
-      <region name="AckNmirrorIl">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorIl">
-    <snippet>
-      <region name="NackNmirrorIl">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-	<test name="Local" description="Local Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">Local0</data>
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">Local1</data>
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">Local2</data>
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">Local3</data>
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">Local4</data>
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">Local5</data>
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">Local6</data>
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">Local7</data>
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">Local8</data>
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">Local9</data>
-			<data name="regionSpec">Local</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorNil0</data>
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorNil1</data>
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorNil2</data>
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorNil3</data>
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorNil4</data>
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorNil5</data>
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorNil6</data>
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorNil7</data>
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorNil8</data>
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorNil9</data>
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-	<test name="NackMirrorNil" description="NackMirrorNil Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorNil0</data>
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorNil1</data>
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorNil2</data>
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorNil3</data>
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorNil4</data>
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorNil5</data>
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorNil6</data>
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorNil7</data>
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorNil8</data>
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorNil9</data>
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-	<test name="AckNmirrorNil" description="AckNmirrorNil Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNil0</data>
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNil1</data>
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNil2</data>
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNil3</data>
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNil4</data>
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNil5</data>
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNil6</data>
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNil7</data>
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNil8</data>
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNil9</data>
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-	<test name="NackNmirrorNil" description="NackNmirrorNil Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNil0</data>
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNil1</data>
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNil2</data>
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNil3</data>
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNil4</data>
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNil5</data>
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNil6</data>
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNil7</data>
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNil8</data>
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNil9</data>
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-	<test name="AckMirrorIl" description="AckMirrorIl Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorIl0</data>
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorIl1</data>
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorIl2</data>
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorIl3</data>
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorIl4</data>
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorIl5</data>
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorIl6</data>
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorIl7</data>
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorIl8</data>
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckMirrorIl9</data>
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-	<test name="NackMirrorIl" description="NackMirrorIl Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorIl0</data>
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorIl1</data>
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorIl2</data>
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorIl3</data>
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorIl4</data>
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorIl5</data>
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorIl6</data>
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorIl7</data>
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorIl8</data>
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackMirrorIl9</data>
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-	<test name="AckNmirrorIl" description="AckNmirrorIl Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorIl0</data>
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorIl1</data>
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorIl2</data>
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorIl3</data>
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorIl4</data>
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorIl5</data>
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorIl6</data>
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorIl7</data>
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorIl8</data>
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorIl9</data>
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-	<test name="NackNmirrorIl" description="NackNmirrorIl Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorIl0</data>
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorIl1</data>
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorIl2</data>
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorIl3</data>
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorIl4</data>
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorIl5</data>
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorIl6</data>
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorIl7</data>
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorIl8</data>
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorIl9</data>
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-	<test name="NackNmirrorNcacheNil" description="NackNmirrorNcacheNil Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNcacheNil0</data>
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNcacheNil1</data>
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNcacheNil2</data>
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNcacheNil3</data>
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNcacheNil4</data>
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNcacheNil5</data>
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNcacheNil6</data>
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNcacheNil7</data>
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNcacheNil8</data>
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">NackNmirrorNcacheNil9</data>
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-	<test name="AckNmirrorNcacheNil" description="AckNmirrorNcacheNil Region Process Growth test">
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNcacheNil0</data>
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNcacheNil1</data>
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNcacheNil2</data>
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNcacheNil3</data>
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNcacheNil4</data>
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNcacheNil5</data>
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNcacheNil6</data>
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNcacheNil7</data>
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNcacheNil8</data>
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doAddRootRegion" container="eventtest" waitTime="60">
-			<data name="regionName">AckNmirrorNcacheNil9</data>
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-		<task name="doEntryOps" action="doRemoveRootRegion" container="eventtest" waitTime="60"/>
-		<task name="doEntryOps" action="doSleep" container="eventtest" waitTime="60">
-			<data name="sleepTime">15</data>
-		</task>
-		<task name="doEntryOps" action="doSizeCheck" container="eventtest" waitTime="30"/>
-	</test>
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Bugs/33201.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Bugs/33201.xml b/src/tests/cpp/xml/Bugs/33201.xml
deleted file mode 100755
index 4471c57..0000000
--- a/src/tests/cpp/xml/Bugs/33201.xml
+++ /dev/null
@@ -1,87 +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="maxTestTime">6000</data>
-	<data name="workTime">300</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="maxRegions">100</data>
-
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes 
-        scope="distributed-no-ack" 
-        mirroring="true" 
-        caching-enabled="true" 
-        interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes 
-        scope="distributed-ack" 
-        mirroring="false" 
-        caching-enabled="true" 
-        interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes 
-        scope="distributed-no-ack" 
-        mirroring="false" 
-        caching-enabled="true" 
-        interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-	<test name="SocketTest" description="Sockets in use test" waitTime="3000">
-		<task name="count" action="doSocketCount" container="eventtest" waitTime="300"/>
-		<task name="count" action="doIterate" container="eventtest" waitTime="300"/>
-		<task name="count" action="doSocketCount" container="eventtest" waitTime="300"/>
-		<task name="CreateRegion" action="doAddRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="count" action="doSocketCount" container="eventtest" waitTime="300"/>
-		<task name="CreateRegion" action="doAddRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-		<task name="count" action="doSocketCount" container="eventtest" waitTime="300"/>
-		<task name="CreateRegion" action="doAddRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="count" action="doSocketCount" container="eventtest" waitTime="300"/>
-		<task name="CreateRegion" action="doAddRootRegion" container="eventtest" waitTime="60" continueOnError="false">
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-		<task name="count" action="doSocketCount" container="eventtest" waitTime="300"/>
-	</test>
-	
-	
-</test-driver>


[24/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/distributedDataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/distributedDataValidationQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/distributedDataValidationQueryTest.xml
deleted file mode 100644
index 3f6277d..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/distributedDataValidationQueryTest.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="client1"/>
-  <client-set name="client2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="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" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="client1"/>
-      <client-set name="client2"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="client1"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="client1"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="client1"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="client1"/>
-      <client-set name="client2"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PositionPdx">
-      <data name="regionName">Positions</data>
-      <client-set name="client1"/>
-      <data name="objectType">PositionPdx</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="Running Param Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="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" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/entryOperationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/entryOperationQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/entryOperationQueryTest.xml
deleted file mode 100644
index 6661fba..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/entryOperationQueryTest.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 Generics/parReg/pdx/RemoteQueryPR/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>10000</item>
-          <item>500</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>9500</item>
-          <item>475</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/failoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/failoverQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/failoverQueryTest.xml
deleted file mode 100644
index 27473a3..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/failoverQueryTest.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">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">4</data>
- 	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-	
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-     </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="Feeder"/>
-  <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="JCS6" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-
-  <test name="QueryFailoverTest" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 7 Generics/RemoteQueryPR/csWithOutIndexRC2.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StartCacheServer 7" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">7</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="3m" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <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="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="10" name="ThinClient"/>
-      <data name="sleepTime">3</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="20" waitTime="1h" continueOnError="true" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="20" waitTime="1h" continueOnError="true" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-     <task name="Running Param Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="60m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="60m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="60m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 5" action="doStopStartServer" container="utils" timesToRun="2" waitTime="60m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="stopStartCacheServer 6" action="doStopStartServer" container="utils" timesToRun="2" waitTime="60m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="stopStartCacheServer 7" action="doStopStartServer" container="utils" timesToRun="2" waitTime="60m" continueOnError="true" parallel="true">
-      <data name="ServerId">7</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StopCacheServer 7" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">7</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/regexAndQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/regexAndQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/regexAndQueryTest.xml
deleted file mode 100644
index 8523477..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/regexAndQueryTest.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="ThinClient1"/>
-  <client-set name="ThinClient2"/>
-
-  <test name="ThinClientRegexNQuery" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQueryPR/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Populate Entries in ThinClient1" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Gets" action="doGetObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <data name="registerRegex">port.*</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="ThinClient2"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Update Entries from ThinClient1" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-          <item>500</item>
-          <item>1000</item>
-          <item>10000</item>
-        </list>
-      </data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/serverEvictionQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/serverEvictionQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/serverEvictionQueryTest.xml
deleted file mode 100644
index 55548a5..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/serverEvictionQueryTest.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <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">-c 2 Generics/parReg/pdx/RemoteQueryPR/csServerEviction.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"> 
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for result set test" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEvent.xml b/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEvent.xml
deleted file mode 100644
index 9ef48c8..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEvent.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="useTransactions">true</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEvent" description="doing operations serially">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/pdx/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-          </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="UpdateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">20</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>80</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEventPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEventPR.xml b/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEventPR.xml
deleted file mode 100644
index 062ee42..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEventPR.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="useTransactions">true</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEvent" description="doing operations serially">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/pdx/RemoteQuery/csPR.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-          </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="UpdateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-          </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">20</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>80</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/subscription/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/subscription/csAckMirror.xml b/src/tests/cpp/xml/Generics/parReg/subscription/csAckMirror.xml
deleted file mode 100644
index a538dae..0000000
--- a/src/tests/cpp/xml/Generics/parReg/subscription/csAckMirror.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 data-policy="partition" concurrency-checks-enabled="true">
-         <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/subscription/csPRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/subscription/csPRegion.xml b/src/tests/cpp/xml/Generics/parReg/subscription/csPRegion.xml
deleted file mode 100644
index a087a58..0000000
--- a/src/tests/cpp/xml/Generics/parReg/subscription/csPRegion.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 data-policy="partition">
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeys.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeys.xml b/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeys.xml
deleted file mode 100644
index 4c0f8aa..0000000
--- a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeys.xml
+++ /dev/null
@@ -1,132 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyAllKeys" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with ALL_KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/subscription/csPRegion.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </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="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOpsRI" action="doVerifyRegionContentsAfterOpsRI" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-   <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/parReg/subscription/staticInterestPolicyAllKeysLateOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeysLateOps.xml b/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeysLateOps.xml
deleted file mode 100644
index 3206770..0000000
--- a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeysLateOps.xml
+++ /dev/null
@@ -1,137 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyAllKeysLateOps" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with ALL_KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/subscription/csPRegion.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </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="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsBeforeOps" action="doVerifyRegionContentsBeforeOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-      <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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>


[15/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale073.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale073.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale073.xml
deleted file mode 100644
index f2faccc..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale073.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">250000</data>
-  <data name="isUpdateTrim">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,FastAssetAccount"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale073" description="Peer feeds update replicated data on peer datahosts and push updates to clients.  Conserve sockets is true.  Uses selector.  Objects are DataSerializable FastAssetAccounts with Instantiator containing 50 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDack5Selector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-      <task name="Update Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/updateupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale074.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale074.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale074.xml
deleted file mode 100644
index e28da74..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale074.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>4800000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>512</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,ArrayOfByte"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale074" description="Peer feeds create partitioned data on peer datahosts and push updates to clients.  Conserve sockets is false.  Uses default connection settings.  Objects are byte arrays of size 512.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale075.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale075.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale075.xml
deleted file mode 100644
index d79dadb..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale075.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,PSTObject"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  
-  <test name="scale075" description="Peer feeds put partitioned data onto peer datahosts and push updates to clients.  Conserve sockets is true.  Uses thread local connections.  Objects are DataSerializable PSTObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-      <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/putupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale076.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale076.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale076.xml
deleted file mode 100644
index 54fa645..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale076.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>3000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">EqStruct</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isUpdateTrim">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,EqStruct"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale076" description="Peer feeds update partitioned data on peer datahosts and push updates to clients.  Conserve sockets is false.  Uses default connection settings.  Objects are DataSerializable EqStructs">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-      <task name="Update Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/updateupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale077.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale077.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale077.xml
deleted file mode 100644
index 30912db..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale077.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2400000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>512</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="bulkOpMapSize">1000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,ArrayOfByte"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale077" description="Peer feeds use bulk ops to create replicated data on peer datahosts and push updates to clients.  Conserve sockets is true.  Uses selector.  Objects are byte arrays of size 512.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDack5Selector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-     <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale078.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale078.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale078.xml
deleted file mode 100644
index 9724ee8..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale078.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>700000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">EqStruct</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="bulkOpMapSize">1000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,EqStruct"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  
-  <test name="scale078" description="Peer feeds use bulk ops to put replicated data onto peer datahosts and push updates to clients.  Conserve sockets is false.  Uses selector. Uses thread local connections.  Objects are DataSerializable EqStructs">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDack5Selector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-     <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Put bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/putupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale079.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale079.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale079.xml
deleted file mode 100644
index 329aafc..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale079.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>4400000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">25</data>
-  <data name="AssetMaxVal">1100000</data>
-  <data name="isUpdateTrim">true</data>
-  <data name="bulkOpMapSize">1000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,FastAssetAccount"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale079" description="Peer feeds use bulk ops to create partitioned data on peer datahosts and push updates to clients.  Conserve sockets is true.  Uses thread local connections.  Objects are DataSerializable FastAssetAccounts with Instantiator containing 25 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 2000 -X 2000 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-   <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/createupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale080.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale080.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale080.xml
deleted file mode 100644
index bd32a95..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale080.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1920000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="bulkOpMapSize">1000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,PSTObject"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  
-  <test name="scale080" description="Peer feeds use bulk ops to put partitioned data onto peer datahosts and push updates to clients.  Conserve sockets is false.  Uses selector. Uses thread local connections.  Objects are DataSerializable PSTObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1Use5Selector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-     <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Put bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/putupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale081.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale081.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale081.xml
deleted file mode 100644
index f0e0975..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale081.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
- <data name="BatchSize">
-    <list>
-      <item>160000</item>
-    </list>
-  </data>
-  <data name="keyType">int</data>
-  <data name="ObjectType">BatchObject</data>
-  <data name="numCQs">1</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  
-  <test name="scale081" description="Peer feeds put replicated data onto peer datahosts and push updates to clients with CQs returning 20% of the keys.  Conserve sockets is true.  Uses thread local connections.  Objects are DataSerializable BatchObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH  smoketest/scale/csMirrorDack.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-     <task name="Register continuously Query" action="doRegisterCQs" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="executeWithInitialResults">false</data>
-      <client-set count="8" name="Client"/>
-     </task> 
-      <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/putupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale082.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale082.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale082.xml
deleted file mode 100644
index dfb9c98..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale082.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-  <data name="BatchSize">
-    <list>
-      <item>220000</item>
-    </list>
-  </data>
-  <data name="keyType">int</data>
-  <data name="ObjectType">BatchObject</data>
-  <data name="numCQs">1</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  
-  <test name="scale082" description="Peer feeds put partitioned data onto peer datahosts and push updates to clients with CQs returning 20% of the keys.  Conserve sockets is false.  Uses default connection settings.  Objects are DataSerializable BatchObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH  smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-     <task name="Register continuously Query" action="doRegisterCQs" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="executeWithInitialResults">false</data>
-      <client-set count="8" name="Client"/>
-     </task> 
-      <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/putupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>


[07/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/putGetAllTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/putGetAllTest.xml b/src/tests/cpp/xml/Native/putGetAllTest.xml
deleted file mode 100644
index c3c0967..0000000
--- a/src/tests/cpp/xml/Native/putGetAllTest.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="expectedCount">100000</data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="150000" 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"/>
-  <client-set name="Subscriber2"/>
-
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPutAll" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPutAll" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>2000</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests"  timesToRun="3" waitTime="15m" parallel="true">
-      <client-set name="Subscriber"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="perftests"  timesToRun="3" waitTime="15m" parallel="true">
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-      <data name="invalidateRegion">true</data>
-    </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">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/Native/regexTestWithFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/regexTestWithFailover.xml b/src/tests/cpp/xml/Native/regexTestWithFailover.xml
deleted file mode 100644
index 16d5714..0000000
--- a/src/tests/cpp/xml/Native/regexTestWithFailover.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="minServers">1</data>
- 
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>5</item>
-      <item>10</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Client1"/>
-  <client-set name="Client2"/>
-
-  <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/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Client1"/>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Client1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Gets Entries in Client2" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Client2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="perftests" waitTime="15m">
-      <data name="registerRegex">AAA*0*1*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Update Entries from Client1" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Client1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Client2"/>
-      <data name="registerKeys">104</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Unregister Regex List" action="doUnRegisterRegexList" container="perftests" waitTime="15m">
-      <data name="unregisterRegex">AAA*0*1*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Update Entries from Client1" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-      <client-set name="Client1"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Client2"/>
-      <data name="registerKeys">100</data>
-      <data name="valueSizes">100</data>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="perftests" waitTime="15m">
-      <data name="registerRegex">AAA*0*2*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="perftests" waitTime="15m">
-      <data name="registerRegex">AAA*0*3*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Update Entries from Client1" action="doPuts" container="perftests" waitTime="15m" parallel="true">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Client1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Client2"/>
-      <data name="registerKeys">109</data>
-      <data name="valueSizes">200</data>
-    </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">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/registerAllKeysGIIValueTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/registerAllKeysGIIValueTest.xml b/src/tests/cpp/xml/Native/registerAllKeysGIIValueTest.xml
deleted file mode 100644
index 0814754..0000000
--- a/src/tests/cpp/xml/Native/registerAllKeysGIIValueTest.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-	
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" 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="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="getInitialValues">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>300</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">300</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="perftests" waitTime="2m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set name="Getter1"/>
-      <data name="getInitialValues">true</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">300</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <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>
-    <task name="StopCacheServers CS2" 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/Native/registerAllKeysTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/registerAllKeysTest.xml b/src/tests/cpp/xml/Native/registerAllKeysTest.xml
deleted file mode 100644
index d40bfca..0000000
--- a/src/tests/cpp/xml/Native/registerAllKeysTest.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="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <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/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="30m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="30m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="2h">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="2h">
-      <client-set name="Destroyer2"/>
-    </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/Native/registerAndUnregisterRegexTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/registerAndUnregisterRegexTest.xml b/src/tests/cpp/xml/Native/registerAndUnregisterRegexTest.xml
deleted file mode 100644
index 6cefc8b..0000000
--- a/src/tests/cpp/xml/Native/registerAndUnregisterRegexTest.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="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/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Gets Entries in Subscriber" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="perftests" waitTime="15m">
-      <data name="registerRegex">AAA*0*1*</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">5</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Unregister Regex List" action="doUnRegisterRegexList" container="perftests" waitTime="15m">
-      <data name="unregisterRegex">AAA*0*1*</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">0</data>
-      <data name="valueSizes">100</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="StopCacheServers" 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" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/registerKeysAndRegexTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/registerKeysAndRegexTest.xml b/src/tests/cpp/xml/Native/registerKeysAndRegexTest.xml
deleted file mode 100644
index 8eb5894..0000000
--- a/src/tests/cpp/xml/Native/registerKeysAndRegexTest.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" 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="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/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-       <client-set name="Publisher"/>
-     </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100</data>
-      <data name="keyIndexBegin">300</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="valueSizes">1000</data>
-      <data name="checkFirst">true</data>
-      <data name="registerKeys">0</data>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100</data>
-      <data name="keyIndexBegin">500</data>
-      <data name="getInitialValues">true</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">100</data>
-      <data name="limit">100</data>
-      <data name="valueSizes">1000</data>
-      <data name="keyIndexBegin">300</data>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="perftests" waitTime="15m">
-      <data name="registerRegex">AAA*0*11*</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="perftests" waitTime="15m">
-      <data name="registerRegex">AAA*0*22*</data>
-      <data name="getInitialValues">true</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">104</data>
-      <data name="valueSizes">1000</data>
-      <data name="limit">100</data>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">208</data>
-      <data name="valueSizes">1000</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">208</data>
-      <data name="valueSizes">500</data>
-      <data name="limit">100</data>
-    </task>
-    <task name="Unregister Regex List" action="doUnRegisterRegexList" container="perftests" waitTime="15m">
-      <data name="unregisterRegex">AAA*0*11*</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">204</data>
-      <data name="valueSizes">100</data>
-       <data name="limit">100</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="StopCacheServers" 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" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/registerKeysAndRegexWithReceiveValue.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/registerKeysAndRegexWithReceiveValue.xml b/src/tests/cpp/xml/Native/registerKeysAndRegexWithReceiveValue.xml
deleted file mode 100644
index 4a460a7..0000000
--- a/src/tests/cpp/xml/Native/registerKeysAndRegexWithReceiveValue.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>40</item>
-    </oneof>
-  </data>
-  
-     
-
-  <data name="keyType">str</data>
-  <data name="checkReceiveVal">true</data>
-
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="receiveValueTrue">
-        <region-attributes client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-   <data name="ThinClientRegion2">
-     <snippet>
-       <region name="receiveValueFalse">
-         <region-attributes client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>  
-       </region>
-     </snippet>
-   </data>
-   <data name="ThinClientRegion3">
-     <snippet>
-       <region name="receiveValueNone">
-         <region-attributes client-notification="true">
-          <cache-listener library="perftests" function="createConflationTestCacheListener"/>
-        </region-attributes>  
-       </region>
-     </snippet>
-   </data>
-  <data name="ThinClientRegionDC1">
-    <snippet>
-      <region name="receiveValueTrue">
-        <region-attributes client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-   <data name="ThinClientRegionDC2">
-     <snippet>
-       <region name="receiveValueFalse">
-         <region-attributes client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListener"/>
-        </region-attributes>  
-       </region>
-     </snippet>
-   </data>
-   <data name="ThinClientRegionDC3">
-     <snippet>
-       <region name="receiveValueNone">
-         <region-attributes client-notification="true">
-          <cache-listener library="durableclienttests" function="createConflationTestCacheListener"/>
-        </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="Feeder1"/>
-  <client-set name="Feeder2"/>
-  <client-set name="Feeder3"/>
-  <client-set count="3" name="Client"/>
-  <client-set count="3" name="DurableClient"/>
-
-  <test name="registerKeysAndRegexWithReciveValue.xml" description="Test to check the register interest's receive value feature">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native/csMultiRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion receiveValueTrue" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="3" name="Client"/>
-      <client-set name="Feeder1"/>
-      <data name="regionSpec">ThinClientRegion1</data>
-    </task>
-    <task name="CreateRegion receiveValueTrue for dc" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set count="3" name="DurableClient"/>
-      <data name="isDurable">true</data>
-      <data name="regionSpec">ThinClientRegionDC1</data>
-    </task>
-    <task name="CreateRegion receiveValueFalse" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="3" name="Client"/>
-      <client-set name="Feeder2"/>
-      <data name="regionSpec">ThinClientRegion2</data>
-    </task>
-    <task name="CreateRegion receiveValueFalse for DC" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set count="3" name="DurableClient"/>
-      <data name="isDurable">true</data>
-      <data name="regionSpec">ThinClientRegionDC2</data>
-    </task>
-    <task name="CreateRegion receiveValueNone" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="3" name="Client"/>
-      <client-set name="Feeder3"/>
-      <data name="regionSpec">ThinClientRegion3</data>
-    </task>
-    <task name="CreateRegion receiveValueNone for dc" action="doCreateRegion" container="durableclienttests" waitTime="5m">
-      <client-set count="3" name="DurableClient"/>
-      <data name="isDurable">true</data>
-      <data name="regionSpec">ThinClientRegionDC3</data>
-    </task>
-    <task name="Register Interest List on receiveValueTrue region" action="doRegisterInterestList" container="perftests" waitTime="2m">
-      <client-set count="3" name="Client"/>
-      <data name="regionName">receiveValueTrue</data>
-      <data name="registerKeys">1</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="receiveValue">true</data>
-    </task>
-    <task name="Register Interest List  on receiveValueFalse region" action="doRegisterInterestList" container="perftests" waitTime="2m">
-      <client-set count="3" name="Client"/>
-      <data name="regionName">receiveValueFalse</data>
-      <data name="registerKeys">1</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="receiveValue">false</data>
-    </task>
-    <task name="Register Interest List on receiveValueTrue region  For DC" action="doRegisterInterestList" container="durableclienttests" waitTime="2m">
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueTrue</data>
-      <data name="registerKeys">1</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="receiveValue">true</data>
-      <data name="isDurableReg">true</data>
-    </task>
-    <task name="Register Interest List on receiveValueFalse region for DC" action="doRegisterInterestList" container="durableclienttests" waitTime="2m">
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueFalse</data>
-      <data name="registerKeys">1</data>
-      <data name="keyIndexBegin">1</data>
-      <data name="receiveValue">false</data>
-      <data name="isDurableReg">true</data>
-    </task>
-    <task name="Register Regex List on receiveValueTrue region" action="doRegisterRegexList" container="perftests" waitTime="2m">
-      <client-set count="3" name="Client"/>
-      <data name="regionName">receiveValueTrue</data>
-       <data name="registerRegex">AAA*0*4*</data>
-      <data name="receiveValue">true</data>
-    </task>
-    <task name="Register Regex List on receiveValueFalse region" action="doRegisterRegexList" container="perftests" waitTime="2m">
-      <client-set count="3" name="Client"/>
-      <data name="regionName">receiveValueFalse</data>
-      <data name="registerRegex">AAA*0*4*</data>
-      <data name="receiveValue">false</data>
-    </task>
-    <task name="Register Regex List on receiveValueTrue region for DC" action="doRegisterRegexList" container="durableclienttests" waitTime="2m">
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueTrue</data>
-      <data name="registerRegex">AAA*0*4*</data>
-      <data name="receiveValue">true</data>
-      <data name="isDurableReg">true</data>
-    </task>
-    <task name="Register Regex List on receiveValueFalse region for DC" action="doRegisterRegexList" container="durableclienttests" waitTime="2m">
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueFalse</data>
-      <data name="registerRegex">AAA*0*4*</data>
-      <data name="receiveValue">false</data>
-      <data name="isDurableReg">true</data>
-    </task>
-    <task name="Entry Operations" action="doCreateUpdateDestroy" container="perftests" timesToRun="200" waitTime="60m" continueOnError="true" parallel="true">
-      <data name="regionName">receiveValueTrue</data>
-      <client-set name="Feeder1"/>
-    </task>
-    <task name="Entry Operations" action="doCreateUpdateDestroy" container="perftests" timesToRun="200" waitTime="60m" continueOnError="true" parallel="true">
-      <data name="regionName">receiveValueFalse</data>
-      <client-set name="Feeder2"/>
-    </task>
-    <task name="Entry Operations" action="doCreateUpdateDestroy" container="perftests" timesToRun="200" waitTime="60m" continueOnError="true" parallel="true">
-      <data name="regionName">receiveValueNone</data>
-      <client-set name="Feeder3"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="360">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="validate test for receiveValueTrue" action="doValidateBankTest" container="perftests" waitTime="5m">
-      <client-set count="3" name="Client"/>
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueTrue</data>
-      <data name="expectedAfterCreateCount">400</data>
-      <data name="expectedAfterUpdateCount">400</data>
-      <data name="expectedAfterInvalidateCount">0</data>
-      <data name="expectedAfterDestroyCount">400</data>
-    </task>
-    <task name="validate test for receiveValueFalse" action="doValidateBankTest" container="perftests" waitTime="5m">
-      <client-set count="3" name="Client"/>
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueFalse</data>
-      <data name="expectedAfterCreateCount">0</data>
-      <data name="expectedAfterUpdateCount">0</data>
-      <data name="expectedAfterInvalidateCount">800</data>
-      <data name="expectedAfterDestroyCount">400</data>
-    </task>
-    <task name="validate test for receiveValueNone" action="doValidateBankTest" container="perftests" waitTime="5m">
-      <client-set count="3" name="Client"/>
-      <client-set count="3" name="DurableClient"/>
-      <data name="regionName">receiveValueNone</data>
-      <data name="expectedAfterCreateCount">0</data>
-      <data name="expectedAfterUpdateCount">0</data>
-      <data name="expectedAfterInvalidateCount">0</data>
-      <data name="expectedAfterDestroyCount">0</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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/Native/ticket226.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/ticket226.xml b/src/tests/cpp/xml/Native/ticket226.xml
deleted file mode 100644
index c11b40d..0000000
--- a/src/tests/cpp/xml/Native/ticket226.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="heapLruLimit">400</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>500</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="clientCount">2</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="JCS" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <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="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </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="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/verifyKeyCountTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/verifyKeyCountTest.xml b/src/tests/cpp/xml/Native/verifyKeyCountTest.xml
deleted file mode 100644
index 12768d3..0000000
--- a/src/tests/cpp/xml/Native/verifyKeyCountTest.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="EntryCount">10000</data>
-  <data name="valueSizes">3000</data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="regionName">TestTCR1</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="client1"/>
-  <client-set name="client2"/>
-
-  <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="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="5m">
-      <client-set name="client1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRootRegion" container="eventtest" waitTime="5m">
-      <client-set name="client2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doAddEntry" container="eventtest" waitTime="15m">
-      <client-set name="client1"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="client1"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify Key Count" action="doVerifyKeyCount" container="eventtest" waitTime="600">
-      <client-set name="client1"/>
-      <data name="expectedKeyCount">10000</data>
-    </task>
-    <task name="Verify Key Count before get" action="doVerifyKeyCount" container="eventtest" waitTime="600">
-      <client-set name="client2"/>
-      <data name="expectedKeyCount">0</data>
-    </task>
-    <task name="Gets Entries in client2" action="doGets" container="eventtest" waitTime="15m">
-      <client-set name="client2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify Key Count" action="doVerifyKeyCount" container="eventtest" waitTime="600">
-      <client-set name="client2"/>
-      <data name="expectedKeyCount">10000</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="StopCacheServers" 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" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/verifyKeyCountWithFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/verifyKeyCountWithFailover.xml b/src/tests/cpp/xml/Native/verifyKeyCountWithFailover.xml
deleted file mode 100644
index ca9e55d..0000000
--- a/src/tests/cpp/xml/Native/verifyKeyCountWithFailover.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="EntryCount">300000</data>
-  <data name="valueSizes">3000</data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="false"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="regionName">TestTCR1</data>
-
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native/csAckMirror.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="Init Feeder" action="doCreateRootRegion" container="eventtest" waitTime="10m">
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Populate Entry" action="doAddEntry" container="eventtest" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Get Entries" action="doGets" container="eventtest" waitTime="30m" parallel="true">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="3h30m" 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="3h30m" 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="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Client"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify Key Count" action="doVerifyKeyCount" container="eventtest" waitTime="600">
-      <client-set count="10" name="Client"/>
-      <data name="expectedKeyCount">300000</data>
-    </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>
-    <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="JCS3"/>
-    </task>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/vmMemory.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/vmMemory.xml b/src/tests/cpp/xml/Native/vmMemory.xml
deleted file mode 100644
index c1f2408..0000000
--- a/src/tests/cpp/xml/Native/vmMemory.xml
+++ /dev/null
@@ -1,169 +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="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="timedInterval">5m</data>
-  <data name="keyType">int</data>
-  <data name="minServers">3</data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="Feeder"/>
-  <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="JCS6" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <data name="cacheType">CLIENT</data>
-
-  <test name="YAPerfTest" description="Thin Client perf test">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 Native/csAckMirror.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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <client-set name="Feeder"/>
-    </task>
-    
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="Wait a bit" action="doSleep" container="utils" waitTime="30m">
-      <client-set name="JCS4"/>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m">
-      <client-set count="10" name="ThinClient"/>
-      <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="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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/CyberTraderInterestListUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/CyberTraderInterestListUpdateTest.xml b/src/tests/cpp/xml/Native43/CyberTraderInterestListUpdateTest.xml
deleted file mode 100644
index a1c4453..0000000
--- a/src/tests/cpp/xml/Native43/CyberTraderInterestListUpdateTest.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>3000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="true" mirroring="false"
-            interest-list-enabled="false" initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="CS1"/>
-  <client-set name="CS2"/>
-  <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" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS1 Native43/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="SetupCacheServer CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-t CS2 Native43/csNotifySubscription.xml</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-      <data name="TAG">CS1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-      <data name="TAG">CS2</data>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Gets Entries in Subscriber" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native43/CyberTraderPerfVariableTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native43/CyberTraderPerfVariableTest.xml b/src/tests/cpp/xml/Native43/CyberTraderPerfVariableTest.xml
deleted file mode 100644
index 5cbc1da..0000000
--- a/src/tests/cpp/xml/Native43/CyberTraderPerfVariableTest.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</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>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-
-  <client-set name="CS1"/>
-  <client-set name="Publisher"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native43/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="perftests" 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="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS1"/>
-    </task>
-  </test>
-
-</test-driver>


[18/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf107.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf107.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf107.xml
deleted file mode 100644
index 47bfc98..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf107.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="durableTimeout">60</data>
-  <data name="isDurable">true</data>
-  <data name="keepAlive">false</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="0"  subscription-redundancy="1" locators="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf107" description="Durable client repeatedly creates and closes a connection pool using autodiscovery.  
-  Durable interest is not kept alive.  Measures time to connect and disconnect.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf108.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf108.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf108.xml
deleted file mode 100644
index a7034c6..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf108.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="durableTimeout">60</data>
-  <data name="isDurable">true</data>
-  <data name="keepAlive">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="0"  subscription-redundancy="1" servers="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf108" description="Durable client repeatedly creates and closes a connection pool using explicit servers.  
-  Durable interest is kept alive.  Measures time to connect and disconnect.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf109.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf109.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf109.xml
deleted file mode 100644
index d05c2b2..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf109.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="durableTimeout">60</data>
-  <data name="isDurable">true</data>
-  <data name="keepAlive">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="0"  subscription-redundancy="1" locators="true" />
-    </snippet>
-  </data>
-
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-
-  <test name="perf109" description="Durable client repeatedly creates and closes a connection pool using autodiscovery.  
-  Durable interest is kept alive.  Measures time to connect and disconnect.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf110.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf110.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf110.xml
deleted file mode 100644
index 52de184..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf110.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="1" max-connections="1" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="securityScheme">
-    <list>
-      <item>NOOP</item>
-  </list>
-  </data>
-
-  <data name="disableShufflingEP">true</data>
-  <data name="contactNum">1</data>
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf110" description="Edge clients create and close a connection pool using explicit servers and security authorization scheme. 
-    Runs on two hosts.  Measures time to connect to server when throttled by 20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="securityParams">valid</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="cyclePoolTask" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="isMainWorkLoad">true</data>
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="securityParams">valid</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf111.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf111.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf111.xml
deleted file mode 100644
index 79067c8..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf111.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="clientCount">1</data>
-  <data name="sleepMs">20</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="1" max-connections="1" subscription-redundancy="0" locators="true" />
-    </snippet>
-  </data>
-  <data name="securityScheme">
-    <list>
-      <item>NOOP</item>
-  </list>
-  </data>
-
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf111" description="Edge clients create and close a connection pool using autodiscovery and security authorization scheme. 
-    Measures time to connect to server when throttled by 20ms sleeps.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="securityParams">valid</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="cyclePoolTask" action="doCyclePoolTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="10m">
-      <data name="isMainWorkLoad">true</data>
-      <data name="poolSpec">ThinClientPool1</data>
-      <data name="securityParams">valid</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf073.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf112.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf112.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf112.xml
deleted file mode 100644
index b1e8e67..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf112.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">1</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf112" description="Empty edge clients fetch entries on server.  Does not use selector.  Runs on two hosts. 
-     Entries are byte arrays of size 1024. Does not use thread local connections.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csDpDefaultNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"String,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="fetch entries on server" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf067.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf113.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf113.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf113.xml
deleted file mode 100644
index 01d3d6b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf113.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">SizedString</data>
-  <data name="clientCount">1</data>
-  <data name="durableTimeout">600</data>
-  <data name="isDurableReg">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="0" locators="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="smokeperf" function="createDurableCacheListenerSP"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="poolSpec">ThinClientPool1</data>
-  <client-set name="Feeder" hostGroup="CS1"/>
-  <client-set count="1" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-
-  <test name="perf113" description="Cycles between a client putting data to the server with overflow to disk and a durable client receiving those updates.  
-  Measures the time it takes the durable client to receive updates.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">smoketest/perf/csAckMirrorWithOFtoDisk.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="3m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="putData" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="20m" parallel="true">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="cycleDurableClientTask" action="doCycleDurableClientTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="10m" parallel="true">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf098.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf114.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf114.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf114.xml
deleted file mode 100644
index 91600f9..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf114.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="1" read-timeout="100000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" pool-name="_Test_Pool1">
-        <!--cache-listener library="smokeperf"  function="createLatencyListener"/-->
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf114" description="Empty edge clients update entries on replicated servers using putAll in batches of 100. 
-    Each client puts its own subset of the keys and registers interest in all keys.  Entries are byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csAckMirror.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Create Entries Map" action="doCreateEntryMapTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="PutAll in Region" action="doPutAllEntryMapTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf021.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf115.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf115.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf115.xml
deleted file mode 100644
index d71d614..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf115.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="1" read-timeout="100000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" pool-name="_Test_Pool1">
-        <!--cache-listener library="smokeperf" function="createLatencyListener"/-->
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS1"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf115" description="Empty edge clients update entries on replicated servers using putAll in batches of 100. 
-    Each client puts its own subset of the keys and registers interest in all keys.  Entries are byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csPRNSTrueRC1.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 256 -X 256 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <!--task name="Create Entries Map" action="doCreateEntryMapTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task-->
-    <task name="PutAll in Region" action="doPutAllEntryMapTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf021.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,Byte[]"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf148.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf148.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf148.xml
deleted file mode 100644
index fd17f47..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf148.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaFastAssetAccount</data>
-  <data name="clientCount">1</data>
-  <!--data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data-->
-  <data name="AssetAccountSize">50</data>
-  <data name="encodeTimestamp">true</data>
-  <!--encode key used as getBeforeUpdate parameter in the delta test /-->
-  <data name="encodeKey">false</data> 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" pool-name="_Test_Pool1">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf148" description="Empty edge clients update entries on replicated servers using delta propagation. Get before update is false.  Cloning enabled is false.  Does not use selector.  Entries are DataSerializable DeltaFastAssetAccounts with 50 FastAssets.  Runs on two hosts.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/perf/csDeltaReplicateCloningFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doUpdateDeltaData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf145.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf149.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf149.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf149.xml
deleted file mode 100644
index 557cf3a..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf149.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>102400</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaPSTObject</data>
-  <data name="clientCount">1</data>
-  <!--data name="disableShufflingEP">true</data>
-  <data name="contactNum">1</data-->
-  <!--encode key used as getBeforeUpdate parameter in the delta test /-->
-  <data name="encodeKey">true</data> 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" pool-name="_Test_Pool1">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="1" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf149" description="Empty edge clients update entries on partitioned servers using delta propagation. Get before update is true.  Cloning enabled is false.  Use selector.  Entries are DataSerializable DeltaPSTObjects with byte arrays of size 102400.  Runs on two hosts.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/perf/csDeltaPRCloningFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 600 -X 600 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Update Entries in Region" action="doUpdateDeltaData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkLoad">true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf145.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf150.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf150.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf150.xml
deleted file mode 100644
index ac6c32b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf150.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaPSTObject</data>
-  <data name="clientCount">1</data>
-  <data name="contactNum">1</data>
-  <data name="disableShufflingEP">true</data>
-  <!--encode key used as getBeforeUpdate parameter in the delta test /-->
-  <data name="encodeKey">false</data> 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" read-timeout="100000" subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" pool-name="_Test_Pool1">
-        <cache-listener library="smokeperf" function="createLatencyListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true" pool-name="_Test_Pool1">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set name="feeder" hostGroup="CS2"/>
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf150" description="Empty edge clients get updates on entries in partitioned servers. An accessor data feed carries out the updates using delta propagation. Get before update is false.  Cloning enabled is false.  Conserve sockets is false.  Entries are DeltaPSTObjects with byte arrays of size 1024.  Runs on two hosts. ">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH smoketest/perf/csDeltaPRCloningFalseNSTrue.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 768 -X 768 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 768 -X 768 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set name="feeder"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set name="feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-    <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="feeder"/>
-    </task>
-    <task name="Update Entries in Region" action="doUpdateDeltaData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set name="feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set name="feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf150.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf152.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf152.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf152.xml
deleted file mode 100644
index 0b2728f..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf152.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">600</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="contactNum">1</data>
-  <data name="putPercentage">20</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" max-connections="8" read-timeout="100000" 
-           subscription-redundancy="0" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-
-  <test name="perf152" description="Empty edge clients do 80% fetches and and 20% updates on entries from partitioned servers.  Runs on two hosts.  Entries are DataSerializable PSTObjects with byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 smoketest/perf/csPRNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="MixPutGet Operations on Region" action="doMixPutGetDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkload">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf016.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf153.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf153.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf153.xml
deleted file mode 100644
index 83574e4..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf153.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">600</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="contactNum">1</data>
-  <data name="putPercentage">20</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" max-connections="30" read-timeout="100000" 
-           subscription-redundancy="0" servers="true" pr-single-hop-enabled="false"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="perf153" description="Empty edge clients do 80% fetches and and 20% updates on entries from partitioned servers. pr_single_hop pool atrribute is false. Runs on two hosts.  Entries are DataSerializable PSTObjects with byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/perf/csPRNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="MixPutGet Operations on Region" action="doMixPutGetDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkload">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf016.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/perf/perf154.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/perf/perf154.xml b/src/tests/cpp/xml/Generics/smoketest/perf/perf154.xml
deleted file mode 100644
index 211fcbd..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/perf/perf154.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">600</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</data>
-  <data name="contactNum">1</data>
-  <data name="putPercentage">20</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="true" max-connections="30" read-timeout="100000" 
-           subscription-redundancy="0" servers="true" pr-single-hop-enabled="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="4" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-
-  <test name="perf154" description="Empty edge clients do 80% fetches and and 20% updates on entries from partitioned servers. pr_single_hop pool atrribute is true. Runs on two hosts.  Entries are DataSerializable PSTObjects with byte arrays of size 1024">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/perf/csPRNSFalse.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-M 512 -X 512 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="MixPutGet Operations on Region" action="doMixPutGetDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isMainWorkload">true</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/perf/perf016.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,PSTObject"  waitTime="5m">
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>


[29/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csServerOverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csServerOverflowToDisk.xml b/src/tests/cpp/xml/Generics/Security/Native/csServerOverflowToDisk.xml
deleted file mode 100644
index 8c9eb1d..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csServerOverflowToDisk.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" persist-backup="true">
-      <eviction-attributes>
-        <lru-heap-percentage maximum="70" time-interval="100" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/multiUserDurableCQ.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/multiUserDurableCQ.xml b/src/tests/cpp/xml/Generics/Security/Native/multiUserDurableCQ.xml
deleted file mode 100644
index d5bfe31..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/multiUserDurableCQ.xml
+++ /dev/null
@@ -1,121 +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="securityScheme">
-   <list>
-      <item>DUMMY</item>
-      <item>LDAP</item>
-      <item>PKCS</item>
-   </list>
-  </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="cq">true</data>
-  <data name="MultiUsers">6</data>
-  <data name="LDAP">
-    <oneof>
-      <item>gemfire</item>  
-    </oneof>    
-  </data>
-  <data name="PKCS">
-    <oneof>
-      <item>gemfire</item>  
-    </oneof>    
-  </data>
-  <data name="DUMMY">
-    <oneof>
-      <item>user</item>  
-    </oneof>    
-  </data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set  count="5" name="DClient"/>
-  <client-set  name="Feeder"/>
-  
-  <test name="MultiUser Security tests" description="Test durable CQ's with durable clients for multiUser mode" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,String">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Security/Native/csAckMirrorSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateClient" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="10m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name ="multiUserMode">true</data>
-      <client-set count="5" name="DClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="FeedSystem" action="doFeedTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="40m" argTypes="String,String">
-      <data name="entryCount">10</data>
-      <client-set  name="Feeder"/>
-    </task>
-    <task name="doCqOperations" action="doCqForMU" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="15m" argTypes="String,String">
-      <client-set count="5" name="DClient"/>
-      <data name="entryOps">
-        <oneof>
-          <item>cq</item>
-        </oneof>
-      </data>
-    </task>
-     <task name="Client Events" action="doEntryOperationsForMU" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-         <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10</data>
-      <client-set  name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="25m" timesToRun="5" parallel="true" argTypes="String,String">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name ="multiUserMode">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios where TRUE</item>
-         </list>
-      </data>
-     <client-set count="5" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name=" Validate for per user" action="doValidateCqOperationsForPerUser" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="5m" argTypes="String,String">
-       <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzFailoverPrMU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzFailoverPrMU.xml b/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzFailoverPrMU.xml
deleted file mode 100644
index e77608f..0000000
--- a/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzFailoverPrMU.xml
+++ /dev/null
@@ -1,164 +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="securityScheme">
-   <list>
-      <item>DUMMY</item>
-      <item>LDAP</item>
-      <item>PKCS</item>
-   </list>
-  </data>
-
- <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-  <data name="isFailover">true</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="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="2" name="Client"/>
-  
-  <test name="MultiUser Security tests" description="To verify multiple users Authentication and Authorization in Failover case" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,String">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -c 3 Security/NativePR/csNotifySubscriptionSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateClient" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="10m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name ="multiUserMode">true</data> 
-      <data name="MultiUsers">9</data>
-      <data name="LDAP">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="PKCS">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="DUMMY">
-        <oneof>
-         <item>user</item>  
-        </oneof>    
-      </data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeedTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="40m" argTypes="String,String">
-      <data name="entryCount">10000</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForMU" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>destroy</item>
-          <item>destroy</item>
-          <item>putAll</item>
-          <item>putAll</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>executefunction</item>
-          <item>executefunction</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,String">
-      <data name="ServerId">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,String">
-      <data name="ServerId">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,String">
-      <data name="ServerId">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name=" Validate for per user" action="doValidateEntryOperationsForPerUser" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="5m" argTypes="String,String" argTypes="String,String">
-       <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <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/Security/NativePR/clientAuthnAndAuthzFailoverPrTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzFailoverPrTest.xml b/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzFailoverPrTest.xml
deleted file mode 100644
index 78c2c19..0000000
--- a/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzFailoverPrTest.xml
+++ /dev/null
@@ -1,269 +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="securityScheme">
-   <list>
-     <item>LDAP</item>
-     <item>DUMMY</item>
-     <item>PKCS</item>
-   </list>
-  </data>
-  
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-  
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <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="WriterClient"/>
-  <client-set count="10" name="ReaderClient"/>
-  <client-set count="10" name="QueryClient"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,byte[]">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 NativePR/csNotifySubscriptionSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS4"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-        </list>
-      </data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClientsWithWriterAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-          <item>destroy</item>
-        </list>
-      </data>
-      <client-set count="10" name="WriterClient"/>
-    </task>
-    <task name="CreateClientsWithReaderAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>get</item>
-          <item>register_interest</item>
-          <item>unregister_interest</item>
-        </list>
-      </data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>
-    <task name="CreateClientsWithQueryAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>query</item>
-        </list>
-      </data>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="40m" argTypes="String,byte[]">
-      <data name="entryCount">10000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>regNUnregInterest</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">10</data>
-      <client-set count="10" name="WriterClient"/>
-      <client-set count="10" name="ReaderClient"/>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">4</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name=" Validate on Writer Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Writer Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-          <item>get</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>get</item>
-         <item>regNUnregInterest</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>query</item>
-       </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Query Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>query</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name=" Validate on Query Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>get</item>
-         <item>regNUnregInterest</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <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/Security/NativePR/clientAuthnAndAuthzPrMU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzPrMU.xml b/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzPrMU.xml
deleted file mode 100644
index 9721f06..0000000
--- a/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzPrMU.xml
+++ /dev/null
@@ -1,102 +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="securityScheme">
-   <list>
-      <item>DUMMY</item>
-      <item>LDAP</item>
-      <item>PKCS</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="5" name="Client"/>
-  
-  <test name="MultiUser PR Security tests" description="To verify multiple users Authentication and Authorization with PR" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,String">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Security/NativePR/csNotifySubscriptionSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateClient" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="10m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name ="multiUserMode">true</data>
-      <data name="MultiUsers">9</data>
-      <data name="LDAP">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="PKCS">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="DUMMY">
-        <oneof>
-         <item>user</item>  
-        </oneof>    
-      </data>
-      <client-set count="5" name="Client"/>
-   
-    </task>
-    <task name="FeedSystem" action="doFeedTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="40m" argTypes="String,String">
-      <data name="entryCount">10000</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForMU" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="30m" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>destroy</item>
-          <item>destroy</item>
-          <item>putAll</item>
-          <item>putAll</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>executefunction</item>
-          <item>executefunction</item>
-        </oneof>
-      </data>
-      <data name="workTime">7m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <client-set count="5" name="Client"/>
-    </task>
-    <task name=" Validate for per user" action="doValidateEntryOperationsForPerUser" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="5m" argTypes="String,String">
-       <client-set count="5" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzPrTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzPrTest.xml b/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzPrTest.xml
deleted file mode 100644
index b8d191a..0000000
--- a/src/tests/cpp/xml/Generics/Security/NativePR/clientAuthnAndAuthzPrTest.xml
+++ /dev/null
@@ -1,222 +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="securityScheme">
-   <list>
-     <item>LDAP</item>
-     <item>DUMMY</item>
-     <item>PKCS</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="WriterClient"/>
-  <client-set count="10" name="ReaderClient"/>
-  <client-set count="10" name="QueryClient"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,byte[]">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativePR/csNotifySubscriptionSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-        </list>
-      </data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClientsWithWriterAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-          <item>destroy</item>
-        </list>
-      </data>
-      <client-set count="10" name="WriterClient"/>
-    </task>
-    <task name="CreateClientsWithReaderAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>get</item>
-          <item>register_interest</item>
-          <item>unregister_interest</item>
-        </list>
-      </data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>
-    <task name="CreateClientsWithQueryAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>query</item>
-        </list>
-      </data>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="40m" argTypes="String,byte[]">
-      <data name="entryCount">10000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>regNUnregInterest</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>destroy</item>
-          <item>cq</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">10</data>
-      <client-set count="10" name="WriterClient"/>
-      <client-set count="10" name="ReaderClient"/>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name=" Validate on Writer Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Writer Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-          <item>get</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>get</item>
-         <item>regNUnregInterest</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>query</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Query Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>query</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name=" Validate on Query Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>get</item>
-         <item>regNUnregInterest</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <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/Security/NativePR/csConflationNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/NativePR/csConflationNotifySubscription.xml b/src/tests/cpp/xml/Generics/Security/NativePR/csConflationNotifySubscription.xml
deleted file mode 100644
index 1663701..0000000
--- a/src/tests/cpp/xml/Generics/Security/NativePR/csConflationNotifySubscription.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" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes enable-subscription-conflation="true">
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/NativePR/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/NativePR/csNotifySubscription.xml b/src/tests/cpp/xml/Generics/Security/NativePR/csNotifySubscription.xml
deleted file mode 100644
index 8db2b29..0000000
--- a/src/tests/cpp/xml/Generics/Security/NativePR/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" maximum-message-count="50000"/>
-  <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/Security/NativePR/csNotifySubscriptionSecurity.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/NativePR/csNotifySubscriptionSecurity.xml b/src/tests/cpp/xml/Generics/Security/NativePR/csNotifySubscriptionSecurity.xml
deleted file mode 100644
index b03c612..0000000
--- a/src/tests/cpp/xml/Generics/Security/NativePR/csNotifySubscriptionSecurity.xml
+++ /dev/null
@@ -1,20 +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="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.RegionOperationsFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.ServerOperationsFunction</class-name>
-    </function>
-  </function-service>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/authz-dummy.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/authz-dummy.xml b/src/tests/cpp/xml/Generics/Security/authz-dummy.xml
deleted file mode 100644
index 14938ad..0000000
--- a/src/tests/cpp/xml/Generics/Security/authz-dummy.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE acl PUBLIC "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
-              "authz5_5.dtd" >
-<acl>
-
-  <role name="reader">
-    <user>reader0</user>
-    <user>reader1</user>
-    <user>reader2</user>
-    <user>root</user>
-    <user>admin</user>
-    <user>administrator</user>
-  </role>
-
-  <role name="writer">
-    <user>writer0</user>
-    <user>writer1</user>
-    <user>writer2</user>
-    <user>root</user>
-    <user>admin</user>
-    <user>administrator</user>
-  </role>
-
-  <role name="cacheOps">
-    <user>root</user>
-    <user>admin</user>
-    <user>administrator</user>
-  </role>
-
-  <role name="queryRegions">
-    <user>reader3</user>
-    <user>reader4</user>
-  </role>
-
-  <permission role="cacheOps">
-    <operation>QUERY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-    <operation>REGION_CREATE</operation>
-    <operation>REGION_DESTROY</operation>
-    <operation>EXECUTE_FUNCTION</operation>
-  </permission>
-
-  <permission role="reader">
-    <operation>GET</operation>
-    <operation>REGISTER_INTEREST</operation>
-    <operation>UNREGISTER_INTEREST</operation>
-    <operation>KEY_SET</operation>
-    <operation>CONTAINS_KEY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-  </permission>
-
-  <permission role="writer">
-    <operation>PUT</operation>
-    <operation>PUTALL</operation>
-    <operation>DESTROY</operation>
-    <operation>REGION_CLEAR</operation>
-    <operation>EXECUTE_FUNCTION</operation>
-  </permission>
-
-  <permission role="queryRegions" regions="Portfolios,/Positions">
-    <operation>QUERY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-  </permission>
-
-</acl>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/authz-dummyMU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/authz-dummyMU.xml b/src/tests/cpp/xml/Generics/Security/authz-dummyMU.xml
deleted file mode 100644
index dd8e492..0000000
--- a/src/tests/cpp/xml/Generics/Security/authz-dummyMU.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE acl PUBLIC "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
-              "authz5_5.dtd" >
-<acl>
-
-  <role name="reader">
-    <user>user1</user>
-    <user>user2</user>
-    <user>user3</user>
-    <user>user4</user>
-    <user>user5</user>
-  <user>administrator</user>
-  </role>
-
-  <role name="writer">
-    <user>user1</user>
-    <user>user2</user>
-    <user>user6</user>
-    <user>user7</user>
-    <user>user8</user>
-  <user>administrator</user>
-  </role>
-
-  <role name="cacheOps">
-    <user>user1</user>
-    <user>user2</user>
-    <user>administrator</user>
-  </role>
-
-  <role name="queryRegions">
-    <user>user9</user>
-    <user>user10</user>
-  </role>
-
-  <permission role="cacheOps">
-    <operation>QUERY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-    <operation>REGION_CREATE</operation>
-    <operation>REGION_DESTROY</operation>
-  </permission>
-
-  <permission role="reader">
-    <operation>GET</operation>
-    <operation>REGISTER_INTEREST</operation>
-    <operation>UNREGISTER_INTEREST</operation>
-    <operation>KEY_SET</operation>
-    <operation>CONTAINS_KEY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-  </permission>
-
-  <permission role="writer">
-    <operation>PUT</operation>
-    <operation>PUTALL</operation>
-    <operation>DESTROY</operation>
-    <operation>REGION_CLEAR</operation>
-    <operation>EXECUTE_FUNCTION</operation>
-  </permission>
-
-  <permission role="queryRegions" regions="Portfolios,/Positions">
-    <operation>QUERY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-  </permission>
-  
-</acl>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/authz-ldap.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/authz-ldap.xml b/src/tests/cpp/xml/Generics/Security/authz-ldap.xml
deleted file mode 100644
index f820d6d..0000000
--- a/src/tests/cpp/xml/Generics/Security/authz-ldap.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE acl PUBLIC "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
-              "authz5_5.dtd" >
-<acl>
-
-  <role name="reader">
-    <user>gemfire1</user>
-    <user>gemfire2</user>
-    <user>gemfire3</user>
-    <user>gemfire4</user>
-    <user>gemfire5</user>
-  </role>
-
-  <role name="writer">
-    <user>gemfire1</user>
-    <user>gemfire2</user>
-    <user>gemfire6</user>
-    <user>gemfire7</user>
-    <user>gemfire8</user>
-  </role>
-
-  <role name="cacheOps">
-    <user>gemfire1</user>
-    <user>gemfire2</user>
-  </role>
-
-  <role name="queryRegions">
-    <user>gemfire9</user>
-    <user>gemfire10</user>
-  </role>
-
-  <permission role="cacheOps">
-    <operation>QUERY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-    <operation>REGION_CREATE</operation>
-    <operation>REGION_DESTROY</operation>
-    <operation>EXECUTE_FUNCTION</operation>
-  </permission>
-
-  <permission role="reader">
-    <operation>GET</operation>
-    <operation>REGISTER_INTEREST</operation>
-    <operation>UNREGISTER_INTEREST</operation>
-    <operation>KEY_SET</operation>
-    <operation>CONTAINS_KEY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-  </permission>
-
-  <permission role="writer">
-    <operation>PUT</operation>
-    <operation>PUTALL</operation>
-    <operation>DESTROY</operation>
-    <operation>REGION_CLEAR</operation>
-    <operation>EXECUTE_FUNCTION</operation>
-  </permission>
-
-  <permission role="queryRegions" regions="/Portfolios,Positions/">
-    <operation>QUERY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-  </permission>
-
-</acl>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/authz-pkcs.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/authz-pkcs.xml b/src/tests/cpp/xml/Generics/Security/authz-pkcs.xml
deleted file mode 100644
index f820d6d..0000000
--- a/src/tests/cpp/xml/Generics/Security/authz-pkcs.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE acl PUBLIC "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
-              "authz5_5.dtd" >
-<acl>
-
-  <role name="reader">
-    <user>gemfire1</user>
-    <user>gemfire2</user>
-    <user>gemfire3</user>
-    <user>gemfire4</user>
-    <user>gemfire5</user>
-  </role>
-
-  <role name="writer">
-    <user>gemfire1</user>
-    <user>gemfire2</user>
-    <user>gemfire6</user>
-    <user>gemfire7</user>
-    <user>gemfire8</user>
-  </role>
-
-  <role name="cacheOps">
-    <user>gemfire1</user>
-    <user>gemfire2</user>
-  </role>
-
-  <role name="queryRegions">
-    <user>gemfire9</user>
-    <user>gemfire10</user>
-  </role>
-
-  <permission role="cacheOps">
-    <operation>QUERY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-    <operation>REGION_CREATE</operation>
-    <operation>REGION_DESTROY</operation>
-    <operation>EXECUTE_FUNCTION</operation>
-  </permission>
-
-  <permission role="reader">
-    <operation>GET</operation>
-    <operation>REGISTER_INTEREST</operation>
-    <operation>UNREGISTER_INTEREST</operation>
-    <operation>KEY_SET</operation>
-    <operation>CONTAINS_KEY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-  </permission>
-
-  <permission role="writer">
-    <operation>PUT</operation>
-    <operation>PUTALL</operation>
-    <operation>DESTROY</operation>
-    <operation>REGION_CLEAR</operation>
-    <operation>EXECUTE_FUNCTION</operation>
-  </permission>
-
-  <permission role="queryRegions" regions="/Portfolios,Positions/">
-    <operation>QUERY</operation>
-    <operation>EXECUTE_CQ</operation>
-    <operation>STOP_CQ</operation>
-    <operation>CLOSE_CQ</operation>
-  </permission>
-
-</acl>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/authz5_5.dtd
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/authz5_5.dtd b/src/tests/cpp/xml/Generics/Security/authz5_5.dtd
deleted file mode 100644
index 43bce78..0000000
--- a/src/tests/cpp/xml/Generics/Security/authz5_5.dtd
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-This is the XML DTD for the GemFire sample XML based authorization callback
-in templates.security.XmlAuthorization.
-
-All XMLs must include a DOCTYPE of the following form:
-
-  <!DOCTYPE acl PUBLIC
-    "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
-    "http://www.gemstone.com/dtd/authz5_5.dtd">
-
-The contents of a declarative XML file correspond to APIs found in the
-
-                      com.gemstone.gemfire.security.AccessControl
-
-package. The sample implementation may be used to specify access control
-policies.
-
--->
-
-<!--
-
-The following conventions apply to all GemFire sample authorization
-XML file elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace in
-  the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is case
-  sensitive.
-
--->
-
-
-<!--
-The "acl" element is the root element of the authorization file.
-This element contains the role to user mappings and role to permissions
-mapping on a per region per operation basis.
--->
-
-<!ELEMENT acl (role+,permission+)>
-
-<!--
-The "role" element contains the set of users that have the permissions of
-given role. A user can be present in more than one "role" elements in
-which case the union of the permissions to all those roles determines
-the full set of permissions to be given to the user.
--->
-
-<!ELEMENT role (user*)>
-<!ATTLIST role
-  name CDATA #REQUIRED
->
-
-<!--
-The "user" element is contained within the "role" element and contains
-the name of a user having the permissions of that role.
--->
-
-<!ELEMENT user (#PCDATA)>
-
-<!--
-The "permission" element specifies the list of operations that are allowed
-for a particular role in the given regions as provided in the optional
-"regions" attribute. The value of "regions" attribute should be a comma
-separated list of region names for which permissions are to be provided.
-If no "regions" attribute is provided then those permissions are provided
-for all the other regions (i.e. other than those that have been explicitly
-specified). Permissions for cache level operations REGION_DESTROY,
-REGION_CREATE, QUERY and CQ operations should be specified with no "regions"
-attribute. If cache-level permission is not provided for QUERY or CQ operations
-then the permission for all the region names in the query string is checked.
--->
-
-<!ELEMENT permission (operation*)>
-<!ATTLIST permission
-  role CDATA #REQUIRED
-  regions CDATA #IMPLIED
->
-
-
-<!--
-The operation should be one of the following strings:
- GET, PUT, DESTROY, REGISTER_INTEREST, UNREGISTER_INTEREST,
- CONTAINS_KEY, KEY_SET, QUERY, EXECUTE_CQ, STOP_CQ, CLOSE_CQ, REGION_CLEAR,
- REGION_CREATE, REGION_DESTROY
--->
-<!ELEMENT operation (#PCDATA)>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/cacheserver/csClientEvents.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/cacheserver/csClientEvents.xml b/src/tests/cpp/xml/Generics/Security/cacheserver/csClientEvents.xml
deleted file mode 100644
index 75d308d..0000000
--- a/src/tests/cpp/xml/Generics/Security/cacheserver/csClientEvents.xml
+++ /dev/null
@@ -1,78 +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="systemName">CSTest</data>
-  <data name="cacheType">PEER</data>
-  <data name="scope">NACK</data>
-  <data name="regionName">CSEvents</data>
-  <data name="valueSizes">
-		<list>
-			<item>100</item>
-			<item>1000</item>
-		</list>
-	</data>	
-  <client-set>
-    <client name="Feeder"/>
-  </client-set>
-  <client-set count="6" name="Server"/>
-  <client-set count="60" name="Client"/>
-
-  <test name="Client Entry Events" description="Clients perform entry events">
-    <task name="Init Feeder" action="doCreateRegion" container="cacheserver" waitTime="10m">
-      <data name="cacheType">PEER</data>
-      <client-set>
-        <client name="Feeder"/>
-      </client-set>
-    </task>
-    <task name="InitServers" action="doInitProcess" container="cacheserver" waitTime="10m">
-      <data name="cacheType">SERVER</data>
-      <client-set count="6" name="Server"/> 
-    </task>
-    <task name="CreateServerRegion" action="doCreateRegion" container="cacheserver" waitTime="10m">
-      <client-set count="1" name="Server"/> 
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="cacheserver" waitTime="10m">
-      <data name="cacheType">CLIENT</data>
-      <data name="listener">createCountingCacheListener</data>
-      <client-set count="60" name="Client"/>
-    </task>    
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="20m">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set>
-        <client name="Feeder"/> 
-      </client-set>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="10h10m" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10h</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set>
-        <client name="Feeder"/>
-      </client-set>
-      <client-set count="60" name="Client"/>
-    </task>
-    <!-- task name="Round Robin ReInit Servers" action="doReInitProcess" container="cacheserver" waitTime="10h10m" parallel="true">
-      <data name="workTime">10h</data>
-      <data name="cacheType">SERVER</data>
-      <data name="clientCount">6</data>
-      <data name="firstClientId">2</data>
-      <client-set count="6" name="Server"/> 
-    </task -->
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/cacheserver/csOverflow.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/cacheserver/csOverflow.xml b/src/tests/cpp/xml/Generics/Security/cacheserver/csOverflow.xml
deleted file mode 100644
index 25a361a..0000000
--- a/src/tests/cpp/xml/Generics/Security/cacheserver/csOverflow.xml
+++ /dev/null
@@ -1,39 +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="maxTestTime">10200</data>
-  <data name="BBName">CacheServer</data>
-  <data name="systemName">CSTest</data>
-  <data name="cacheType">PEER</data>
-  <data name="scope">ACK</data>
-  <data name="regionName">CSRegion</data>
-  <client-set count="3" name="Server"/>
-  <client-set count="5" name="Client"/>
-
-  <test name="Overflow" description="server overflow test">
-    <task name="CreateServerProcesses" action="doInitProcess" container="cacheserver" waitTime="600">
-      <data name="cacheType">SERVER</data>
-      <client-set count="3" name="Server"/> 
-    </task>
-    <task name="CreateServerRegion" action="doCreateRegion" container="cacheserver" waitTime="600">
-      <data name="cacheType">SERVER</data>
-      <data name="enableOverflow">true</data>
-      <client-set count="1" name="Server"/>
-    </task>
-    <task name="CreateClients" action="createProcess" container="cacheserver" waitTime="600" >
-      <data name="cacheType">CLIENT</data>
-      <data name="enableCache">false</data>
-      <client-set count="5" name="Client"/> 
-    </task>
-    <task name="FeedSystem" action="doFeed" container="cacheserver" waitTime="3600" parallel="true">
-      <data name="entryCount">20000</data>
-      <data name="valueSizes">10240</data>
-      <data name="opsSecond">40</data>
-      <client-set count="1" name="Client"/> 
-    </task>
-    <task name="TwinkleServer" action="doReInitProcess" container="cacheserver" waitTime="3600" parallel="true">
-      <data name="workTime">600</data>
-      <data name="cacheType">SERVER</data>
-      <client-set begin="1" count="2" name="Server"/> 
-    </task>
-    </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/csAckMirror.xml b/src/tests/cpp/xml/Generics/Security/csAckMirror.xml
deleted file mode 100644
index 3f2e001..0000000
--- a/src/tests/cpp/xml/Generics/Security/csAckMirror.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/cq.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/cq.list b/src/tests/cpp/xml/Generics/cq.list
deleted file mode 100644
index 81b68d0..0000000
--- a/src/tests/cpp/xml/Generics/cq.list
+++ /dev/null
@@ -1,15 +0,0 @@
-Generics/CqQuery/serialCQMTTest.xml
-Generics/CqQuery/cqDurableQS.xml
-Generics/CqQuery/concCQMTTest.xml
-Generics/CqQuery/resultSetValidationCQTest.xml
-Generics/CqQuery/serialEntryEvent.xml
-Generics/CqQuery/serialEntryEventWithRegInterest.xml
-Generics/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
-Generics/CqQuery/singleRegCQOps.xml
-Generics/CqQuery/multRegCQOps.xml
-Generics/CqQuery/serverFailoverAndCQOps.xml
-Generics/CqQuery/multRegServerFailoverAndCQOps.xml
-Generics/CqQuery/durableTimeoutWithCq.xml
-Generics/CqQuery/durableWithCqKAFalse.xml
-Generics/CqQuery/durableWithCqKATrue.xml
-Generics/CqQuery/durableCqFailoverR2.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/cstx.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/cstx.list b/src/tests/cpp/xml/Generics/cstx.list
deleted file mode 100644
index 6df3715..0000000
--- a/src/tests/cpp/xml/Generics/cstx.list
+++ /dev/null
@@ -1,16 +0,0 @@
-Generics/parReg/tx/serialEntryEvent.xml
-Generics/parReg/tx/serialEntryEventPR.xml
-Generics/parReg/tx/serialEntryEventWithRegInterest.xml
-Generics/parReg/tx/serialEntryEventPRWithRegInterest.xml
-Generics/parReg/tx/serverFailoverAndCQOps.xml
-Generics/parReg/tx/singleRegCQOps.xml
-#Generics/parReg/tx/concDeltaPRBridge.xml
-#Generics/parReg/tx/concDeltaReplicateBridge.xml
-Generics/parReg/tx/conParRegBridgeRedundency1.xml
-Generics/parReg/tx/conParRegBridgeRedundency2.xml
-Generics/parReg/tx/conParRegBridgeRedundency3.xml
-Generics/parReg/tx/conParRegBridgeRRRedundency2.xml
-Generics/parReg/tx/onRegionFunctionExecWithResult.xml
-Generics/parReg/tx/onRegionFunctionExecWithOutResult.xml
-Generics/parReg/tx/replicatedRegionExecution.xml
-Generics/parReg/tx/functionExecutionHA.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/delta.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/delta.list b/src/tests/cpp/xml/Generics/delta.list
deleted file mode 100644
index 657951d..0000000
--- a/src/tests/cpp/xml/Generics/delta.list
+++ /dev/null
@@ -1,6 +0,0 @@
-Generics/Delta/deltaPropogationForPR.xml
-Generics/Delta/deltaPropogationNoConflation.xml
-Generics/Delta/deltaPropogationFailoverForPR.xml
-Generics/Delta/deltaPropogationFailoverNoConflation.xml
-Generics/Delta/deltaPropogationWithEvictionForPR.xml
-Generics/Delta/deltaPropogationWithOverFlow.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/durableCSharp.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/durableCSharp.list b/src/tests/cpp/xml/Generics/durableCSharp.list
deleted file mode 100644
index 58843c8..0000000
--- a/src/tests/cpp/xml/Generics/durableCSharp.list
+++ /dev/null
@@ -1,8 +0,0 @@
-Generics/DurableClient/durableFailoverR2.xml
-Generics/DurableClient/durableNonDurableKAFalse.xml
-Generics/DurableClient/durableNonDurableKATrue.xml
-Generics/DurableClient/durableNonDurableTimeout.xml
-Generics/DurableClient/durablePR/durableFailoverR2.xml
-Generics/DurableClient/durablePR/durableNonDurableKAFalse.xml
-Generics/DurableClient/durablePR/durableNonDurableKATrue.xml
-Generics/DurableClient/durablePR/durableNonDurableTimeout.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/functionExecutionCsharp.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/functionExecutionCsharp.list b/src/tests/cpp/xml/Generics/functionExecutionCsharp.list
deleted file mode 100644
index 8f83843..0000000
--- a/src/tests/cpp/xml/Generics/functionExecutionCsharp.list
+++ /dev/null
@@ -1,12 +0,0 @@
-Generics/FunctionExecution/onRegionFunctionExecWithResult.xml
-Generics/FunctionExecution/onRegionFunctionExecWithOutResult.xml
-Generics/FunctionExecution/onServerFunctionExecWithResult.xml
-Generics/FunctionExecution/onServerFunctionExecWithOutResult.xml
-Generics/FunctionExecution/onServersFunctionExecWithResult.xml
-Generics/FunctionExecution/onServersFunctionExecWithOutResult.xml
-Generics/FunctionExecution/replicatedRegionExecution.xml
-Generics/FunctionExecution/exceptionHandling.xml
-Generics/FunctionExecution/functionExecutionHA.xml
-Generics/FunctionExecution/onRegionFunctionExecHAWithResult.xml
-Generics/FunctionExecution/FESingleHopNonOptimized.xml
-Generics/FunctionExecution/FESingleHopOptimized.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/hct/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/hct/csAckMirror.xml b/src/tests/cpp/xml/Generics/hct/csAckMirror.xml
deleted file mode 100644
index a1fd1be..0000000
--- a/src/tests/cpp/xml/Generics/hct/csAckMirror.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" concurrency-checks-enabled="true"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/hct/staticInterestPolicyAllKeys.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/hct/staticInterestPolicyAllKeys.xml b/src/tests/cpp/xml/Generics/hct/staticInterestPolicyAllKeys.xml
deleted file mode 100644
index 7a70c5a..0000000
--- a/src/tests/cpp/xml/Generics/hct/staticInterestPolicyAllKeys.xml
+++ /dev/null
@@ -1,132 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyAllKeys" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with ALL_KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </task>
-    <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </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="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOpsRI" action="doVerifyRegionContentsAfterOpsRI" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-   <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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/hct/staticInterestPolicyAllKeysLateOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/hct/staticInterestPolicyAllKeysLateOps.xml b/src/tests/cpp/xml/Generics/hct/staticInterestPolicyAllKeysLateOps.xml
deleted file mode 100644
index 958fda2..0000000
--- a/src/tests/cpp/xml/Generics/hct/staticInterestPolicyAllKeysLateOps.xml
+++ /dev/null
@@ -1,137 +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>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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"/>
-
-  <test name="staticInterestPolicyAllKeysLateOps" description="In a client VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with ALL_KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 hct/csAckMirror.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.cacheserver"  waitTime="3m" argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" argTypes="int,object">
-      <client-set name="Feeder"/>
-      <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 name="Feeder"/>
-    </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="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsBeforeOps" action="doVerifyRegionContentsBeforeOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-      <task name="DoOperations" action="doOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOps" action="doVerifyRegionContentsAfterLateOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 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>


[14/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale083.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale083.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale083.xml
deleted file mode 100644
index 816c8e9..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale083.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>200000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaFastAssetAccount</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">50000</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" cloning-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,DeltaFastAssetAccount"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" cloning-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale083" description="Peer feeds update replicated data on peer datahosts and push updates to clients.  Uses delta propagation with cloningEnabled false.  Conserve sockets is true.  Uses selector.  
-  Objects are DataSerializable DeltaFastAssetAccounts with Instantiator containing 50 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDack5Selector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-     <task name="Put Delta Entries in Region" action="doUpdateScaleDeltaData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <<client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/updateupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale084.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale084.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale084.xml
deleted file mode 100644
index 3d24604..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale084.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>200000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaPSTObject</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" cloning-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,DeltaPSTObject"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" cloning-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
- <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale084" description="Peer feeds update partitioned data on peer datahosts and push updates to clients.  Uses delta propagation with cloningEnabled false.  Conserve sockets is false.  Uses selector.  Objects are DataSerializable DeltaPSTObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1Use5Selector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-     <task name="Put Delta Entries in Region" action="doUpdateScaleDeltaData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <<client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/updateupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale085.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale085.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale085.xml
deleted file mode 100644
index 9e01561..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale085.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>920000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isDurableReg">true</data> 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,PSTObject"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  
-  <test name="scale085" description="Peer feeds put replicated data onto peer datahosts and push updates to durable clients.  Conserve sockets is true.  Uses thread local connections.  Objects are DataSerializable PSTObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDack.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-     <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-   <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-      <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/putupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale086.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale086.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale086.xml
deleted file mode 100644
index 6066e19..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale086.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isDurableReg">true</data> 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,ArrayOfByte"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  
-  <test name="scale086" description="Peer feeds put partitioned data onto peer datahosts and push updates to durable clients.  Conserve sockets is false.  Uses default connection settings.  Objects are byte arrays of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N -J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N -J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-     <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-     <task name="Open Statistic" action="doOpenStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-      <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data name="arguments">../build_*/framework/xml/smoketest/scale/putupdateEvents.spec statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" 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="StopCacheServers" 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="Generate Trim Spec" action="doGenerateScaleTrimSpec" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/subscription.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/subscription.list b/src/tests/cpp/xml/Generics/subscription.list
deleted file mode 100644
index 1bbb49c..0000000
--- a/src/tests/cpp/xml/Generics/subscription.list
+++ /dev/null
@@ -1,18 +0,0 @@
-Generics/hct/staticInterestPolicySingle.xml
-Generics/hct/staticInterestPolicySingleLateOps.xml
-Generics/hct/staticInterestPolicyList.xml
-Generics/hct/staticInterestPolicyListLateOps.xml
-Generics/hct/staticInterestPolicyAllKeys.xml
-Generics/hct/staticInterestPolicyAllKeysLateOps.xml
-#Generics/parReg/tx/staticInterestPolicySingle.xml
-#Generics/parReg/tx/staticInterestPolicySingleLateOps.xml
-#Generics/parReg/tx/staticInterestPolicyList.xml
-#Generics/parReg/tx/staticInterestPolicyListLateOps.xml
-#Generics/parReg/tx/staticInterestPolicyAllKeys.xml
-#Generics/parReg/tx/staticInterestPolicyAllKeysLateOps.xml
-Generics/parReg/subscription/staticInterestPolicySingle.xml
-Generics/parReg/subscription/staticInterestPolicySingleLateOps.xml
-Generics/parReg/subscription/staticInterestPolicyList.xml
-Generics/parReg/subscription/staticInterestPolicyListLateOps.xml
-Generics/parReg/subscription/staticInterestPolicyAllKeys.xml
-Generics/parReg/subscription/staticInterestPolicyAllKeysLateOps.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/entryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/entryEvent.xml b/src/tests/cpp/xml/Mcast/entryEvent.xml
deleted file mode 100644
index ade0a86..0000000
--- a/src/tests/cpp/xml/Mcast/entryEvent.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="keySize">
-    <range low="4" high="12"/>
-  </data>
-  <client-set count="20" name="Client"/>
-  <data name="distinctKeys">10000</data>
-  <data name="valueSizes">low="0" high="8000"</data>
-  <!-- Number of add ops is equal to number of destroy ops -->
-  <data name="entryOps">
-    <oneof>
-      <item>add</item>
-      <item>add</item>
-      <item>update</item>
-      <item>update</item>
-      <item>update</item>
-      <item>read</item>
-      <item>read</item>
-      <item>read</item>
-      <item>invalidate</item>
-      <item>localInvalidate</item>
-      <item>destroy</item>
-      <item>localDestroy</item>
-    </oneof>
-  </data>
-  <data name="opCount">
-    <range low="1" high="10"/>
-  </data>
-  <data name="workTime">120</data>
-  <data name="maxRegions">100</data>
-  
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  <test name="All" description="Entry Event test" waitTime="5400">
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">AckNmirrorNcacheNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">NackNmirrorNcacheNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionName">MixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>AckNmirrorNil</item>
-          <item>AckMirrorNil</item>
-          <item>AckNmirrorNcacheNil</item>
-        </oneof>
-      </data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionName">MixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>NackNmirrorNil</item>
-          <item>NackMirrorNil</item>
-          <item>NackNmirrorNcacheNil</item>
-        </oneof>
-      </data>
-    </task>
-  </test>
-</test-driver>
-

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/entryEventLong.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/entryEventLong.xml b/src/tests/cpp/xml/Mcast/entryEventLong.xml
deleted file mode 100755
index 0f29d6c..0000000
--- a/src/tests/cpp/xml/Mcast/entryEventLong.xml
+++ /dev/null
@@ -1,179 +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="keySize">
-		<range low="4" high="12"/>
-	</data>
-	<data name="distinctKeys">
-		10000
-	</data>
-	<data name="valueSizes">
-		<range low="0" high="8000"/>
-	</data>
-	<!-- Number of add ops is equal to number of destroy ops -->
-	<data name="entryOps">
-		<oneof>
-			<item>add</item>
-			<item>add</item>
-			<item>update</item>
-			<item>update</item>
-			<item>update</item>
-			<item>read</item>
-			<item>read</item>
-			<item>read</item>
-			<item>invalidate</item>
-			<item>localInvalidate</item>
-			<item>destroy</item>
-			<item>localDestroy</item>
-		</oneof>
-	</data>
-	<data name="opCount">
-		<range low="1" high="10"/>
-	</data>
-	<data name="workTime">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="maxRegions">100</data>
-
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Entry Event test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" threadCount="4">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="NackMirrorNil" description="NackMirrorNil Entry Event test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" threadCount="4">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="AckNmirrorNil" description="AckNmirrorNil Entry Event test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" threadCount="4">
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorNil" description="NackNmirrorNil Entry Event test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" threadCount="4">
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="AckNmirrorNcacheNil" description="AckNmirrorNcacheNil Entry Event test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" threadCount="4">
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorNcacheNil" description="NackNmirrorNcacheNil Entry Event test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" threadCount="4">
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-	</test>
-	
-	<test name="MixedAckNil" description="MixedNil Entry Event test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" threadCount="4">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>AckNmirrorNil</item>
-					<item>AckMirrorNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="MixedNackNil" description="MixedNil Entry Event test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" threadCount="4">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNmirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>NackNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>
-	
-	<test name="Local" description="Local Entry Event test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" threadCount="4">
-			<data name="regionSpec">Local</data>
-		</task>
-	</test>
-	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/largeMembership.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/largeMembership.xml b/src/tests/cpp/xml/Mcast/largeMembership.xml
deleted file mode 100644
index 8cd3f1c..0000000
--- a/src/tests/cpp/xml/Mcast/largeMembership.xml
+++ /dev/null
@@ -1,107 +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">
-  <client-set>
-    <client name="checker"/>
-  </client-set>
-  <client-set count="20" name="A"/>
-  <client-set count="20" name="B"/>
-  <client-set count="20" name="C"/>
-  <client-set count="20" name="D"/>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <test name="Distributed System" description="Distributed System test" waitTime="5400">
-    <task name="DistributedMemberCount" action="doDistributedMemberCount" container="eventtest" waitTime="600">
-    </task>
-    <task name="CreateRegion-AckMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">AckMirrorNil</data>
-      <data name="regionName">AckMirrorNil</data>
-    </task>
-    <task name="Verify CreateRegion-AckMirrorNil" action="doVerifyPeerCount" container="eventtest" waitTime="600">
-      <client-set>
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">AckMirrorNil</data>
-      <data name="regionName">AckMirrorNil</data>
-    </task>
-    <task name="CreateRegion-NackMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">NackMirrorNil</data>
-      <data name="regionName">NackMirrorNil</data>
-    </task>
-    <task name="Verify CreateRegion-NackMirrorNil" action="doVerifyPeerCount" container="eventtest" waitTime="600">
-      <client-set>
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">NackMirrorNil</data>
-      <data name="regionName">NackMirrorNil</data>
-    </task>
-    <task name="CreateRegion-AckNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">AckNmirrorNil</data>
-      <data name="regionName">AckNmirrorNil</data>
-    </task>
-    <task name="Verify CreateRegion-AckNmirrorNil" action="doVerifyPeerCount" container="eventtest" waitTime="600">
-      <client-set>
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">AckNmirrorNil</data>
-      <data name="regionName">AckNmirrorNil</data>
-    </task>
-    <task name="CreateRegion-NackNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">NackNmirrorNil</data>
-      <data name="regionName">NackNmirrorNil</data>
-    </task>
-    <task name="Verify CreateRegion-NackNmirrorNil" action="doVerifyPeerCount" container="eventtest" waitTime="600">
-      <client-set>
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">NackNmirrorNil</data>
-      <data name="regionName">NackNmirrorNil</data>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/mirrorGII.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/mirrorGII.xml b/src/tests/cpp/xml/Mcast/mirrorGII.xml
deleted file mode 100644
index f984738..0000000
--- a/src/tests/cpp/xml/Mcast/mirrorGII.xml
+++ /dev/null
@@ -1,52 +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">
-  <client-set count="20" name="A"/>
-  <data name="regionName">MirrorGII</data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="MirrorGII">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="MirrorGII">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="valueSizes">100</data>
-  <data name="EntryCount">100</data>
-  <data name="usePID">1</data>
-  <test name="MirrorGII" description="AckMirrorNilGII test" waitTime="2400">
-    <task name="CreateRegion-AckNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="A_1"/>
-      </client-set>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Populate-AckMirrorNil" action="doAddEntry" container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="A_1"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-AckMirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <client-set>
-        <client name="A_1"/>
-      </client-set>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Verify" action="doVerifyKeyCount" container="eventtest" waitTime="600">
-      <client-set>
-        <client name="A_1"/>
-      </client-set>
-      <data name="expectedKeyCount">1900</data>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/netSearch.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/netSearch.xml b/src/tests/cpp/xml/Mcast/netSearch.xml
deleted file mode 100644
index 6bfb78b..0000000
--- a/src/tests/cpp/xml/Mcast/netSearch.xml
+++ /dev/null
@@ -1,97 +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="EntryCount">10000</data>
-  <data name="valueSizes">1000</data>
-  <data name="usePID">1</data>  
-  <data name="regionName">NetSearchRegion</data>
-  <client-set>
-    <client name="Search"/>
-  </client-set>
-  <client-set count="19" name="Source"/>
-
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <test name="NetSearch" description="All regions are not mirrored, one of the is cachless. It does netsearch to get all data on each region"
-    waitTime="5400">
-    <task name="CreateSourceRegion-AckNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="1200">
-      <data name="regionSpec">AckNmirrorNil</data>
-      <client-set count="19" name="Source"/>
-    </task>
-    <task name="CreateSearchRegion-AckNmirrorNcacheNil" action="doCreateRootRegion" container="eventtest" waitTime="1200">
-      <data name="regionSpec">AckNmirrorNcacheNil</data>
-      <client-set>
-        <client name="Search"/>
-      </client-set>
-    </task>
-    <task name="PopulateSources-AckNmirrorNil" action="doAddEntry" container="eventtest" waitTime="1200">
-      <client-set count="19" name="Source"/>
-    </task>
-    <task name="NetSearch" action="doNetSearch" container="eventtest" waitTime="3600">
-      <client-set>
-        <client name="Search"/>
-      </client-set>
-    </task>
-    <task name="RemoveRegion" action="doRemoveRootRegion" container="eventtest" waitTime="100">
-    </task>
-  </test>
-
-  <test name="NetSearch" description="All regions are not mirrored, one of the is cachless. It does netsearch to get all data on each region"
-    waitTime="5400">
-    <task name="CreateSourceRegion-NackNmirrorNil" action="doCreateRootRegion" container="eventtest" waitTime="1200">
-      <data name="regionSpec">NackNmirrorNil</data>
-      <client-set count="19" name="Source"/>
-    </task>
-    <task name="CreateSearchRegion-NackNmirrorNcacheNil" action="doCreateRootRegion" container="eventtest" waitTime="1200">
-      <data name="regionSpec">NackNmirrorNcacheNil</data>
-      <client-set>
-        <client name="Search"/>
-      </client-set>
-    </task>
-    <task name="PopulateSources-NackNmirrorNil" action="doAddEntry" container="eventtest" waitTime="1200">
-      <client-set count="19" name="Source"/>
-    </task>
-    <task name="NetSearch" action="doNetSearch" container="eventtest" waitTime="3600">
-      <client-set>
-        <client name="Search"/>
-      </client-set>
-    </task>
-    <task name="RemoveRegion" action="doRemoveRootRegion" container="eventtest" waitTime="100">
-    </task>
-  </test>
-
-</test-driver>
-

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/perfBenchmark.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/perfBenchmark.xml b/src/tests/cpp/xml/Mcast/perfBenchmark.xml
deleted file mode 100644
index d687f28..0000000
--- a/src/tests/cpp/xml/Mcast/perfBenchmark.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="timedInterval">120</data>
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-      <item>10</item>
-    </list>
-  </data>
-  
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set>
-    <client name="Producer"/>
-  </client-set>
-  <client-set count="19" name="Consumer"/>
-  <test name="AckMirrorNil" description="AckMirrorNil Entry Event test" waitTime="5400">
-    <task name="CreateRegion-AckMirrorNil" action="doCreateRegion" container="perftests" waitTime="1200">
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-AckNmirrorNil" action="doCreateRegion" container="perftests" waitTime="1200">
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-AckNmirrorNcacheNil" action="doCreateRegion" container="perftests" waitTime="1200">
-      <data name="regionSpec">AckNmirrorNcacheNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="1200">
-    </task>
-    <task name="CreateLocal" action="doCreateRegion" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-NackMirrorNil" action="doCreateRegion" container="perftests" waitTime="1200">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-NackNmirrorNil" action="doCreateRegion" container="perftests" waitTime="1200">
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-NackNmirrorNcacheNil" action="doCreateRegion" container="perftests" waitTime="1200">
-      <data name="regionSpec">NackNmirrorNcacheNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="1200">
-    </task>
-  </test>
-</test-driver>
-

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/regionContentTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/regionContentTest.xml b/src/tests/cpp/xml/Mcast/regionContentTest.xml
deleted file mode 100644
index 74cd630..0000000
--- a/src/tests/cpp/xml/Mcast/regionContentTest.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!-- Test for check get Initail Image and region content -->
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="valueSizes">100</data>
-  <data name="maxTestTime">10200</data>
-  <data name="workTime">300</data>
-  <data name="preemptCounter">10</data> <!-- abort, exit, done ops downcounter before execution -->
-  <data name="maxRegions">100</data> 
-  
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNilLstnr">
-    <snippet>
-      <region name="AckMirrorNilLstnr">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set count="20" name="Client"/>
-  <test name="CheckRegionContent" description="AckMirrorNil Validating Cache Content Test">
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNil</data>
-      <client-set exclude="true">
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    
-    <task name="PopulateRegion" action="doAddEntry" container="eventtest" waitTime="600">
-      <data name="EntryCount">100000</data>
-      <data name="regionName">DistRegionA</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateLocalRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">LocalRegionA</data>
-      <data name="regionSpec">Local</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doIterateOnEntry" action="doIterateOnEntry" container="eventtest" waitTime="600">
-      <data name="testRegion">DistRegionA</data>
-      <data name="validateRegion">LocalRegionA</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="regionContentValidation" action="doValidateRegionContent" container="eventtest"
-      waitTime="1200">
-      <data name="testRegion">DistRegionA</data>
-      <data name="validateRegion">LocalRegionA</data>
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-  </test>
-  <test name="CheckRegionContent" description="AckNmirrorNil Validating Cache Content Test">
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA2</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-      <client-set exclude="true">
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA2</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateLocalRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">LocalRegionA2</data>
-      <data name="regionSpec">Local</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="PopulateRegion" action="doAddEntry" container="eventtest" waitTime="600">
-      <data name="EntryCount">10000</data>
-      <data name="usePID">1</data>
-      <data name="regionName">DistRegionA2</data>
-      <client-set exclude="true">
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doIterateOnEntry" action="doIterateOnEntry" container="eventtest" waitTime="600">
-      <data name="testRegion">DistRegionA2</data>
-      <data name="validateRegion">LocalRegionA2</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="regionContentValidation" action="doValidateRegionContent" container="eventtest"
-      waitTime="1200">
-      <data name="testRegion">DistRegionA2</data>
-      <data name="validateRegion">LocalRegionA2</data>
-      <data name="regionName">DistRegionA2</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/regionEventMT.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/regionEventMT.xml b/src/tests/cpp/xml/Mcast/regionEventMT.xml
deleted file mode 100644
index bc11665..0000000
--- a/src/tests/cpp/xml/Mcast/regionEventMT.xml
+++ /dev/null
@@ -1,166 +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="regionOps">
-		<oneof>
-			<item>addRegion</item>
-			<item>addRegion</item>
-			<item>addRegion</item>
-			<item>addRegion</item>
-			<item>invalidateRegion</item>
-			<item>destroyRegion</item>
-			<item>localInvalidateRegion</item>
-			<item>localDestroyRegion</item>
-			<!-- <item>abort</item>  seg v -->
-			<!-- <item>exit</item>	  exit(0) -->
-			<!-- <item>done</item>	leave doOperation, exit while loop -->
-		</oneof>
-	</data>
-	<data name="regionPaths">
-		<oneof>
-			<item>/RR1/R1/R2</item>
-			<item>/RR2/R1/R2</item>
-			<item>/RR3/R1/R2</item>
-			<item>/RR4/R1/R2</item>
-			<item>/RR5/R1/R2</item>
-		</oneof>
-	</data>
-  <client-set count="20" name="Client"/>
-	<data name="randomOP"> 5 </data>
-	<data name="workTime">30</data>
-	<data name="preemptCounter">10</data>
-	<data name="initRegionNumObjects">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="maxRegions">10</data>
-
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-	
-	<test name="Local" description="Local Entry Event test">
-		<task name="doRegionOps" action="doRegionOperations" container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-			<data name="regionSpec">Local</data>
-		</task>
-	</test>
-	
-	<test name="AckMirrorNil" description="AckMirrorNil Entry Event test">
-		<task name="doRegionOps" action="doRegionOperations" container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="NackMirrorNil" description="NackMirrorNil Entry Event test">
-		<task name="doRegionOps" action="doRegionOperations" container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="AckNmirrorNil" description="AckNmirrorNil Entry Event test">
-		<task name="doRegionOps" action="doRegionOperations" container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorNil" description="NackNmirrorNil Entry Event test">
-		<task name="doRegionOps" action="doRegionOperations" container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-	</test>
-			
-	<test name="AckNmirrorNcacheNil" description="AckNmirrorNcacheNil Entry Event test">
-		<task name="doRegionOps" action="doRegionOperations" container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-			<data name="regionSpec">AckNmirrorNcacheNil</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorNcacheNil" description="NackNmirrorNcacheNil Entry Event test">
-		<task name="doRegionOps" action="doRegionOperations" container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-			<data name="regionSpec">NackNmirrorNcacheNil</data>
-		</task>
-	</test>
-	
-	<test name="MixedNil" description="MixedNil Entry Event test">
-		<task name="doRegionOps" action="doRegionOperations" container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-			<data name="regionName">MixedNil</data>
-			<data name="regionSpec">
-				<oneof>
-					<item>NackNmirrorNil</item>
-					<item>NackMirrorNil</item>
-					<item>AckNmirrorNil</item>
-					<item>AckMirrorNil</item>
-					<item>NackNmirrorNcacheNil</item>
-					<item>AckNmirrorNcacheNil</item>
-				</oneof>
-			</data>
-		</task>
-	</test>	
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/Deprecated/dsMemberCount.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/Deprecated/dsMemberCount.xml b/src/tests/cpp/xml/Misc/Deprecated/dsMemberCount.xml
deleted file mode 100755
index e1c92f2..0000000
--- a/src/tests/cpp/xml/Misc/Deprecated/dsMemberCount.xml
+++ /dev/null
@@ -1,47 +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="maxTestTime">6000</data>
-	<data name="minTaskGranularitySec">30</data>
-	<data name="totalTaskTimeSec">1200</data>
-	<data name="maxResultWaitSec">600</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="haltIfBadResult">true</data>
-	<data name="maxRegions">50</data>
-	<data name="installListener">true</data>
-	<data name="installWriter">false</data>
-	<data name="installLoader">false</data>
-	<data-set name="Local">
-		<data name="regionName">Local</data>
-		<data name="scope">local</data>
-	</data-set>
-	<data-set name="AckMirrorNil">
-		<data name="regionName">AckMirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackMirrorNil">
-		<data name="regionName">NackMirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">true</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="AckNmirrorNil">
-		<data name="regionName">AckNmirrorNil</data>
-		<data name="scope">ack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	<data-set name="NackNmirrorNil">
-		<data name="regionName">NackNmirrorNil</data>
-		<data name="scope">nack</data>
-		<data name="mirroring">false</data>
-		<data name="interestListEnabled">false</data>
-	</data-set>
-	
-        <test name="Local" description="Local Event test" waitTime="780">
-	    <task name="DistributedMemberCount" action="doDistributedMemberCount" container="eventtest" waitTime="60" timesToRun="5" continueOnError="true">
-            </task>
-        </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/VerifyPeerRegionCount.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/VerifyPeerRegionCount.xml b/src/tests/cpp/xml/Misc/VerifyPeerRegionCount.xml
deleted file mode 100644
index dd73268..0000000
--- a/src/tests/cpp/xml/Misc/VerifyPeerRegionCount.xml
+++ /dev/null
@@ -1,26 +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="regionName">TestRegion</data>
-
-  <test name="VerifyPeerRegionCount"
-      description="Verify that peers for a region can see each other">
-
-    <task name="CreatePeerRegions"
-        action="doCreateRegion"
-        container="vpc"
-        waitTime="2m"/>
-
-    <task name="CountPeers"
-        action="doVerifyPeerCount"
-        container="vpc"
-        waitTime="2m"/>
-
-    <task name="DestroyPeerRegions"
-        action="doDestroyRegion"
-        container="vpc"
-        waitTime="2m"/>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/cacheContentTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/cacheContentTest.xml b/src/tests/cpp/xml/Misc/cacheContentTest.xml
deleted file mode 100755
index e14a30d..0000000
--- a/src/tests/cpp/xml/Misc/cacheContentTest.xml
+++ /dev/null
@@ -1,124 +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="keySize">
-		<range low="4" high="12"/>
-	</data>
-	<data name="distinctKeys">
-		10000
-	</data>
-	<data name="valueSizes">
-		<range low="0" high="10000"/>
-	</data>
-	<data name="entryOps">
-		<oneof>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>add</item>
-			<item>done</item>
-			
-		</oneof>
-	</data>
-	<data name="opCount">
-		<range low="1" high="10"/>
-	</data>
-	<data name="maxTestTime">10200</data>
-	<data name="workTime">300</data>
-	<data name="preemptCounter">10</data>
-	<!-- abort, exit, done ops downcounter before execution -->
-	<data name="maxRegions">100</data>
-
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="RegionA">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="Validate">
-    <snippet>
-      <region name="RegionB">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="RegionC">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="ValidateNonMirror">
-    <snippet>
-      <region name="RegionD">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-	<client-set name="CacheChecker">
-	  <client name="ClientA"/>
-	</client-set>
-
-	
-	<test name="CheckCacheContent" description="AckMirrorNil Validating Cache Content Test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" >
-		    <data name="regionName">RegionA</data>
-		    <data name="regionSpec">AckMirrorNil</data>
-		</task>
-		<task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="1200" continueOnError="true" >
-		    <data name="regionName">RegionB</data>
-		    <data name="regionSpec">Validate</data>
-		</task>
-	       <task name="doIterateOnEntry" action="doIterateOnEntry" container="eventtest" waitTime="1200" continueOnError="true">
-		    <data name="testRegion">RegionA</data>
-		    <data name="validateRegion">RegionB</data>
-	            <client-set ><client name="ClientA"/></client-set>
-	       </task>
-	       <task name="checkCacheContent" action="doValidateCacheContent" container="eventtest" waitTime="1200" continueOnError="true">
-		    <data name="testRegion">RegionA</data>
-		    <data name="validateRegion">RegionB</data>
-	            <client-set exclude="true"><client name="ClientA"/></client-set>
-	       </task>
-	</test>
-	<test name="CheckNmirrorCacheContent" description="AckNonMirrorNil validating Cache content Test">
-		<task name="doEntryOps" action="doEntryOperations" container="eventtest" waitTime="1200" continueOnError="true" >
-		    <data name="regionName">RegionC</data>
-		    <data name="regionSpec">AckNmirrorNil</data>
-		</task>
-		<task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="1200" continueOnError="true" >
-		    <data name="regionName">RegionD</data>
-		    <data name="regionSpec">ValidateNonMirror</data>
-		</task>
-		<!--task name="addEntry" action="doAddEntry" container="eventtest" waitTime="1200" continueOnError="true" >
-		    <data name="regionName">RegionC</data>
-		    <data name="regionSpec">AckNmirrorNil</data>
-		</task-->
-	       <task name="doIterateOnEntry" action="doIterateOnEntry" container="eventtest" waitTime="1200" continueOnError="true">
-		    <data name="testRegion">RegionC</data>
-		    <data name="validateRegion">RegionD</data>
-	            <client-set ><client name="ClientA"/></client-set>
-	       </task>
-	       <task name="checkCacheContent" action="doValidateCacheContent" container="eventtest" waitTime="1200" continueOnError="true">
-		    <data name="testRegion">RegionC</data>
-		    <data name="validateRegion">RegionD</data>
-	            <client-set exclude="true"><client name="ClientA"/></client-set>
-	       </task>
-	</test>
-</test-driver>


[40/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
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>


[13/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/getInitialImage.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/getInitialImage.xml b/src/tests/cpp/xml/Misc/getInitialImage.xml
deleted file mode 100755
index 730458a..0000000
--- a/src/tests/cpp/xml/Misc/getInitialImage.xml
+++ /dev/null
@@ -1,67 +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="NackMirrorNil">
-    <snippet>
-      <region name="GiiTwinkle">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="GiiTwinkle">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="opsSecond">50</data>
-  <data name="EntryCount">2000000</data>
-  <data name="valueSizes">10</data>
-  <data name="regionName">GiiTwinkle</data>
-  
-  <client-set>
-    <client name="Feed"/>
-  </client-set>
-  <client-set count="16" name="Client"/>
-  
-  <test name="GII Test with twinkle" 
-    description="GII with regions twinkling with feed creates." waitTime="30m">
-    <task name="Create feed" action="doCreateRootRegion" 
-      container="eventtest" waitTime="1m">
-      <data name="regionSpec">NackNmirrorNcacheNil</data>
-    <client-set>
-      <client name="Feed"/>
-    </client-set>
-    </task>
-    <task name="Create mirrors" action="doCreateRootRegion" 
-      container="eventtest" waitTime="1m">
-      <data name="regionSpec">NackMirrorNil</data>
-      <client-set count="16" name="Client"/>
-    </task>
-    <task name="Feed system" action="doFeedEntries" container="eventtest" 
-      waitTime="22m" parallel="true">
-      <data name="workTime">20m</data>
-      <client-set>
-        <client name="Feed"/>
-      </client-set>
-    </task>
-    <task name="Twinkle mirrors" action="doTwinkleRegion" container="eventtest"
-      waitTime="23m" parallel="true">
-      <data name="workTime">21m</data>
-      <data name="sleepTime">
-        <range high="240" low="30"/>
-      </data>
-      <data name="regionSpec">NackMirrorNil</data>
-      <client-set count="16" name="Client"/>
-    </task>
-    <task name="VerifyKeyCount" action="doVerifyKeyCount" container="eventtest"
-      waitTime="21m">
-      <data name="regionSpec">NackMirrorNil</data>
-      <client-set count="16" name="Client"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/memoryMeasurement.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/memoryMeasurement.xml b/src/tests/cpp/xml/Misc/memoryMeasurement.xml
deleted file mode 100755
index ff55b59..0000000
--- a/src/tests/cpp/xml/Misc/memoryMeasurement.xml
+++ /dev/null
@@ -1,174 +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="keySize">
-		<range low="4" high="12"/>
-	</data>
-	<data name="distinctKeys">     
-	  <list>
-      <item>10240</item>
-      <item>102400</item>
-      <item>307200</item>
-      <item>512000</item>
-      <item>819200</item>
-      <item>1048576</item>
-    </list>
-  </data>
-	<data name="valueSizes"> 		
-	  <list>
-			<item>1024</item>
-		</list> 
-	</data>
-	<data name="workTime">90</data>
-	<data name="maxRegions">10</data>
-
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorIl">
-    <snippet>
-      <region name="AckMirrorIl">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorIl">
-    <snippet>
-      <region name="NackMirrorIl">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorIl">
-    <snippet>
-      <region name="AckNmirrorIl">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorIl">
-    <snippet>
-      <region name="NackNmirrorIl">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="true">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-	<test name="Local" description="memory measurement for Local regions">
-		<task name="doMemoryMeasurement" action="doMemoryMeasurement" container="eventtest" waitTime="9000" timesToRun="1" continueOnError="true" threadCount="1">
-			<data name="regionSpec">Local</data>
-		</task>
-	</test>
-
-	<test name="AckMirrorNil" description="memory measurement for AckMirrorNil regions">
-		<task name="doMemoryMeasurement" action="doMemoryMeasurement" container="eventtest" waitTime="9000" timesToRun="1" continueOnError="true" threadCount="1">
-			<data name="regionSpec">AckMirrorNil</data>
-		</task>
-	</test>
-
-	<test name="NackMirrorNil" description="memory measurement for NackMirrorNil regions">
-		<task name="doMemoryMeasurement" action="doMemoryMeasurement" container="eventtest" waitTime="9000" timesToRun="1" continueOnError="true" threadCount="1">
-			<data name="regionSpec">NackMirrorNil</data>
-		</task>
-	</test>
-
-	<test name="AckNmirrorNil" description="memory measurement for AckNmirrorNil regions">
-		<task name="doMemoryMeasurement" action="doMemoryMeasurement" container="eventtest" waitTime="9000" timesToRun="1" continueOnError="true" threadCount="1">
-			<data name="regionSpec">AckNmirrorNil</data>
-		</task>
-	</test>
-	
-	<test name="NackNmirrorNil" description="memory measurement for NackNmirrorNil regions">
-		<task name="doMemoryMeasurement" action="doMemoryMeasurement" container="eventtest" waitTime="9000" timesToRun="1" continueOnError="true" threadCount="1">
-			<data name="regionSpec">NackNmirrorNil</data>
-		</task>
-	</test>
-
-	<test name="AckMirrorIl" description="memory measurement for AckMirrorIl regions">
-		<task name="doMemoryMeasurement" action="doMemoryMeasurement" container="eventtest" waitTime="9000" timesToRun="1" continueOnError="true" threadCount="1">
-			<data name="regionSpec">AckMirrorIl</data>
-		</task>
-	</test>
-
-	<test name="NackMirrorIl" description="memory measurement for NackMirrorIl regions">
-		<task name="doMemoryMeasurement" action="doMemoryMeasurement" container="eventtest" waitTime="9000" timesToRun="1" continueOnError="true" threadCount="1">
-			<data name="regionSpec">NackMirrorIl</data>
-		</task>
-	</test>
-
-	<test name="AckNmirrorIl" description="memory measurement for AckNmirrorIl regions">
-		<task name="doMemoryMeasurement" action="doMemoryMeasurement" container="eventtest" waitTime="9000" timesToRun="1" continueOnError="true" threadCount="1">
-			<data name="regionSpec">AckNmirrorIl</data>
-		</task>
-	</test>
-
-	<test name="NackNmirrorIl" description="memory measurement for NackNmirrorIl regions">
-		<task name="doMemoryMeasurement" action="doMemoryMeasurement" container="eventtest" waitTime="9000" timesToRun="1" continueOnError="true" threadCount="1">
-			<data name="regionSpec">NackNmirrorIl</data>
-		</task>
-	</test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/quickTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/quickTest.xml b/src/tests/cpp/xml/Misc/quickTest.xml
deleted file mode 100755
index 6b4fe2f..0000000
--- a/src/tests/cpp/xml/Misc/quickTest.xml
+++ /dev/null
@@ -1,85 +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">
-  <localFile name="aTestFile" description="This is to allow annotation.">
-  And this is line one of the content
-  
-      followed by line2.
-      
-    And line three is
-  next to last, while this       is last!!!
-  </localFile>
-  <localFile name="aTestScript" append="false" description="Test starting clients using a script">
-    echo "My arguments were: $@" 
-    pwd
-    ls -l
-    echo
-    echo
-    echo find . -exec ls -l {} \;
-    find . -exec ls -l {} \;
-    echo
-    echo done
-  </localFile>
-  <data name="vanilla">basic data content example</data>
-  <data name="alist">
-  <list>
-  <item>a</item>
-  <item>b</item>
-  <item>c</item>
-  <item>d</item>
-  </list>
-  </data>
-  <data name="aoneof">
-  <oneof>
-  <item>a2</item>
-  <item>b3</item>
-  <item>c4</item>
-  <item>d5</item>
-  </oneof>
-  </data>
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes 
-        scope="local" 
-        mirroring="false" 
-        caching-enabled="true" 
-        initial-capacity="25" 
-        load-factor="0.32" 
-        concurrency-level="10" 
-        interest-list-enabled="false" 
-        max-value-dist-limit="20" 
-        lru-entries-limit="35" 
-        disk-policy="overflows">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="region_def-1">
-    <snippet>
-      <region name="Root1">
-        <region-attributes scope="distributed-ack" mirroring="false" caching-enabled="true" initial-capacity="25" load-factor="0.32" concurrency-level="10" interest-list-enabled="false" max-value-dist-limit="20" lru-entries-limit="35" disk-policy="overflows">
-          <persistence-manager library="BDB" function="getBDBManager">
-            <properties>
-              <property name="directory" value="/tmp"/>
-              <property name="max-file-size" value="200"/>
-            </properties>
-          </persistence-manager>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <client-set count="2" name="server"/>
-  <client-set count="1" name="feed"/>
-  <client-set count="2" name="client"/>
-  
-  <client-set>
-    <client name="RunsTasksClient"/>
-  </client-set>
-  <test name="sleeper" description="nada" waitTime="30">
-    <task name="Run arbitrary program" action="doRunProcess" container="utils" waitTime="100">
-      <data name="program">. aTestScript</data>
-      <data name="arguments">these will not be used</data>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/rawLBM.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/rawLBM.xml b/src/tests/cpp/xml/Misc/rawLBM.xml
deleted file mode 100755
index 496aa64..0000000
--- a/src/tests/cpp/xml/Misc/rawLBM.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data> 
-  
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  
-	<data name="valueSizes">
-		<list>
-			<item>1000</item>
-		</list>
-	</data>
-	
-	<data name="numThreads">
-		<list>
-			<item>1</item>
-		</list>
-	</data>
-  
-  <data name="scope">ack</data>
-  <data name="topicName">rawTopic</data>
-	
-	<client-set>
-		<client name="Ping"/>
-		<client name="Pong"/>
-	</client-set>
-	
-	<test name="Local" description="Local Entry Event test">
-    <task name="Gets" action="doRawGets" container="perftests" waitTime="160" parallel="true">
-      <client-set>
-        <client name="Pong"/>
-      </client-set>
-    </task>
-    <task name="Puts" action="doRawPuts" container="perftests" waitTime="160" parallel="true">
-      <client-set>
-        <client name="Ping"/>
-      </client-set>
-    </task>
-	</test>
-		
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/regionContentTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/regionContentTest.xml b/src/tests/cpp/xml/Misc/regionContentTest.xml
deleted file mode 100755
index faa085f..0000000
--- a/src/tests/cpp/xml/Misc/regionContentTest.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!-- Test for check get Initail Image and region content -->
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="valueSizes">100</data>
-  <data name="maxTestTime">10200</data>
-  <data name="workTime">300</data>
-  <data name="preemptCounter">10</data> <!-- abort, exit, done ops downcounter before execution -->
-  <data name="maxRegions">100</data>
-  
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="DistRegionA">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNilLstnr">
-    <snippet>
-      <region name="DistRegionA">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="DistRegionA">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set count="20" name="Client"/>
-  <test name="CheckRegionContent" description="AckMirrorNil Validating Cache Content Test">
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNil</data>
-      <client-set exclude="true">
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    
-    <task name="PopulateRegion" action="doAddEntry" container="eventtest" waitTime="600">
-      <data name="EntryCount">100000</data>
-      <data name="regionName">DistRegionA</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateLocalRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">LocalRegionA</data>
-      <data name="regionSpec">Local</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doIterateOnEntry" action="doIterateOnEntry" container="eventtest" waitTime="600">
-      <data name="testRegion">DistRegionA</data>
-      <data name="validateRegion">LocalRegionA</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="regionContentValidation" action="doValidateRegionContent" container="eventtest"
-      waitTime="1200">
-      <data name="testRegion">DistRegionA</data>
-      <data name="validateRegion">LocalRegionA</data>
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-  </test>
-  <test name="CheckRegionContent" description="AckNmirrorNil Validating Cache Content Test">
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA2</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-      <client-set exclude="true">
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateRootRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA2</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateLocalRgn" action="doCreateRootRegion" container="eventtest" waitTime="600">
-      <data name="regionName">LocalRegionA2</data>
-      <data name="regionSpec">Local</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="PopulateRegion" action="doAddEntry" container="eventtest" waitTime="600">
-      <data name="EntryCount">10000</data>
-      <data name="usePID">1</data>
-      <data name="regionName">DistRegionA2</data>
-      <client-set exclude="true">
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doIterateOnEntry" action="doIterateOnEntry" container="eventtest" waitTime="600">
-      <data name="testRegion">DistRegionA2</data>
-      <data name="validateRegion">LocalRegionA2</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="regionContentValidation" action="doValidateRegionContent" container="eventtest"
-      waitTime="1200">
-      <data name="testRegion">DistRegionA2</data>
-      <data name="validateRegion">LocalRegionA2</data>
-      <data name="regionName">DistRegionA2</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-  </test>
-</test-driver>