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>

Reply via email to