geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [10/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:22:49 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/failoverTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/failoverTest.xml b/src/tests/cpp/xml/MixedModeCS/failoverTest.xml
deleted file mode 100644
index 697e378..0000000
--- a/src/tests/cpp/xml/MixedModeCS/failoverTest.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="CSDriver" hostGroup="CSD"/>
-  <client-set count="6" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="YAPerfTest" description="Thin Client perf test">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startCSFwk</data>
-      <data name="arguments">--xml=MixedModeCS/failoverTest_CS.xml</data>
-      <data name="background">true</data>
-      <client-set name="CSDriver"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="6" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="6" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="15m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate true</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="3" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="4" count="3" name="ThinClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="3" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="WaitForCSharp" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneCSharp 1200</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="StopCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopCSFwk</data>
-      <data name="arguments"></data>
-      <client-set name="CSDriver"/>
-    </task>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/failoverTest_CS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/failoverTest_CS.xml b/src/tests/cpp/xml/MixedModeCS/failoverTest_CS.xml
deleted file mode 100644
index cd35205..0000000
--- a/src/tests/cpp/xml/MixedModeCS/failoverTest_CS.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">15m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set count="6" name="ThinClient"/>
-
-  <test name="YAPerfTest" description="Thin Client perf test">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">CPP</data>
-      <client-set count="1" name="ThinClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="6" name="ThinClient"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="6" name="ThinClient"/>
-    </task>
-    <task name="WaitForPopulate" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate 1200</data>
-      <client-set count="1" name="ThinClient"/>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="3" name="ThinClient"/>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="4" count="3" name="ThinClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-    <task name="DoneCSharp" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneCSharp true</data>
-      <client-set count="1" name="ThinClient"/>
-    </task>
-  </test>
-
-</test-driver>

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/interopWithFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/interopWithFailover.xml b/src/tests/cpp/xml/MixedModeCS/interopWithFailover.xml
deleted file mode 100644
index fff5e46..0000000
--- a/src/tests/cpp/xml/MixedModeCS/interopWithFailover.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="regionName">TestTCR1</data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="C++Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="CSDriver" hostGroup="CSD"/>
-  <client-set count="10" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Native/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-
-    <task name="StartCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startCSFwk</data>
-      <data name="arguments">--xml=MixedModeCS/interopWithFailover_CS.xml</data>
-      <data name="background">true</data>
-      <client-set name="CSDriver"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="querytests" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="C++Feeder"/>
-    </task>
-
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-      <client-set name="C++Feeder"/>
-    </task>
-
-    <task name="FeedC++" action="doPopulateRangePositions" container="querytests" waitTime="5m">
-      <data name="range-start">0</data>
-      <data name="range-end">500</data>
-      <client-set name="C++Feeder"/>
-    </task>
-
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate true</data>
-      <client-set name="C++Feeder"/>
-    </task>
-
-    <task name="WaitForCSharpDonePopulate" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulateCS 1200</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="Client Events" action="doUpdateRangePositions" container="queryTests" waitTime="2h10m" parallel="true">
-      <data name="workTime">30m</data>
-      <data name="range-max">1000</data>
-      <client-set name="C++Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="3" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="3" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="3" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-
-    <task name="Client Events" action="doVerifyAllPositionObjects" container="queryTests" waitTime="2h10m">
-      <data name="range-max">1000</data>
-      <client-set name="C++Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="querytests" waitTime="2m"/>
-    
-    <task name="WaitForCSharp" action="doRunProcess" container="utils" waitTime="20m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneCSharp 1200</data>
-      <client-set name="C++Feeder"/>
-    </task>
-
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-
-  </test>
-</test-driver>

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

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

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest.xml b/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest.xml
deleted file mode 100644
index 93fd190..0000000
--- a/src/tests/cpp/xml/Native/CyberTraderPerfVariableTest.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>50000</item>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="perftests" waitTime="30m">
-      <client-set name="Publisher"/>
-      <data name="keyType">int</data>
-    </task>
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="perftests" waitTime="45m">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="2m"/>
-
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS1"/>
-    </task>
-  </test>
-
-</test-driver>

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

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

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

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


Mime
View raw message