geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [09/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:22:48 GMT
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>


Mime
View raw message