http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestWithHLRU.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestWithHLRU.xml 
b/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestWithHLRU.xml
deleted file mode 100644
index efb0643..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestWithHLRU.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="heapLruLimit">100</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>80</item>
-      <item>160</item>
-      <item>320</item>
-      <item>640</item>
-      <item>1280</item>
-      <item>2560</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="CS3" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test with puts and 
gets for keyType string">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-
-    <task name="Measure Performance Variable with cache size" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size" 
action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" 
waitTime="1h" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-
-    <task name="StartCacheServers CS3" action="doRunProcess" container="utils" 
waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-
-    <task name="Measure Performance Variable with cache size with 3rd cache 
member" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput with 3rd cache member" action="doGets" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size with 3rd cache 
member" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="String,byte[]"/>
-
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="StopCacheServers CS3" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/clientEvents.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/clientEvents.xml 
b/src/tests/cpp/xml/Generics/Native/clientEvents.xml
deleted file mode 100644
index 2d01723..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientEvents.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" 
client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" 
function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry 
events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" 
argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" 
argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="String,byte[]">
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="String,byte[]">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" 
waitTime="2h10m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/clientEventsFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/clientEventsFailover.xml 
b/src/tests/cpp/xml/Generics/Native/clientEventsFailover.xml
deleted file mode 100644
index d875692..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientEventsFailover.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-   
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" 
client-notification="false"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" 
client-notification="true">
-          <cache-listener library="perftests" 
function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry 
events">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" 
waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Native/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" 
argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data> 
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" 
argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegionWithListener</data> 
-      <client-set count="20" name="Client"/>
-    </task>    
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="String,byte[]">
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="String,byte[]">
-      <data name="entryCount">5000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" 
parallel="true" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>putAll</item>
-          <item>getAll</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">5000</data>
-      <data name="valueSizes">100</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="30m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/clientQConflationNoServerConflation.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/Native/clientQConflationNoServerConflation.xml 
b/src/tests/cpp/xml/Generics/Native/clientQConflationNoServerConflation.xml
deleted file mode 100644
index 9fe14fc..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientQConflationNoServerConflation.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="conflate">true</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" 
function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionDurable">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" 
function="createConflationTestCacheListenerDC"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="30" name="ThinClient"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientQConflationTest" description="Thin Client Q Conflation 
test with server conflation setting disabled">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e 
CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p 
\"-J-DslowStartTimeForTesting=170000\" -c 3 
Native/csAckMirrorNoConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion with conflation setting yes" 
action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion with conflation setting no" 
action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion with conflation setting server" 
action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation on" 
action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting no" 
action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting 
server" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="1" count="15" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys for durable client" 
action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="15" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="update" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" timesToRun="350" 
waitTime="60m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-      <data name="valueSizes">20</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="550">
-      <client-set count="30" name="ThinClient"/>
-      <data name="sleepTime">300</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-      <data name="isServerConflateTrue">false</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-      <data name="isServerConflateTrue">false</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/clientQConflationServerConflation.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/Native/clientQConflationServerConflation.xml 
b/src/tests/cpp/xml/Generics/Native/clientQConflationServerConflation.xml
deleted file mode 100644
index ab4e1a0..0000000
--- a/src/tests/cpp/xml/Generics/Native/clientQConflationServerConflation.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="conflate">true</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" 
function="createConflationTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionDurable">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="durableclienttests" 
function="createConflationTestCacheListenerDC"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="30" name="ThinClient"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientQConflationTest" description="Thin Client Q conflation 
test with server conflation setting enabled">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e 
CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -p 
\"-J-DslowStartTimeForTesting=170000\" -c 3 
Native/csAckMirrorConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion with conflation setting yes" 
action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion with conflation setting no" 
action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion with conflation setting server" 
action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation on" 
action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">true</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting no" 
action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">false</data>
-    </task>
-    <task name="CreateRegion for durable client with conflation setting 
server" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="regionSpec">ThinClientRegionDurable</data>
-      <data name="isDurable">true</data>
-      <data name="durableTimeout">120</data>
-      <data name="conflateEvents">server</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-  <client-set begin="1" count="15" name="ThinClient"/>
-</task>
-    <task name="Register All Keys for durable client" 
action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.durableclienttests" 
waitTime="5m" argTypes="Int32,byte[]">
-      <client-set begin="16" count="15" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 
argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="update" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" timesToRun="350" 
waitTime="60m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-      <data name="valueSizes">20</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="550">
-      <client-set count="30" name="ThinClient"/>
-      <data name="sleepTime">300</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="11" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-      <data name="isServerConflateTrue">true</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="16" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="21" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">3500</data>
-    </task>
-    <task name="validate conflation with conflation on" 
action="doValidateQConflation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]">
-      <client-set begin="26" count="5" name="ThinClient"/>
-      <data name="expectedAfterCreateCount">10</data>
-      <data name="expectedAfterUpdateCount">10</data>
-      <data name="isServerConflateTrue">true</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" 
argTypes="Int32,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Reply via email to