geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [35/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:14 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/regexTestWithFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/regexTestWithFailover.xml b/src/tests/cpp/xml/Generics/Native/regexTestWithFailover.xml
deleted file mode 100644
index f6a28d1..0000000
--- a/src/tests/cpp/xml/Generics/Native/regexTestWithFailover.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="minServers">1</data>
- 
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>5</item>
-      <item>10</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="Client1"/>
-  <client-set name="Client2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Client1"/>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Client1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">100</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Gets Entries in Client2" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Client2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerRegex">AAA*0*1*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Update Entries from Client1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Client1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Client2"/>
-      <data name="registerKeys">104</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="Unregister Regex List" action="doUnRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="unregisterRegex">AAA*0*1*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Update Entries from Client1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-      <client-set name="Client1"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Client2"/>
-      <data name="registerKeys">100</data>
-      <data name="valueSizes">100</data>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerRegex">AAA*0*2*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerRegex">AAA*0*3*</data>
-      <client-set name="Client2"/>
-    </task>
-    <task name="Update Entries from Client1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Client1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" waitTime="10m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Client2"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Client2"/>
-      <data name="registerKeys">109</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/registerAllKeysGIIValueTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/registerAllKeysGIIValueTest.xml b/src/tests/cpp/xml/Generics/Native/registerAllKeysGIIValueTest.xml
deleted file mode 100644
index 4b4887d..0000000
--- a/src/tests/cpp/xml/Generics/Native/registerAllKeysGIIValueTest.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="getInitialValues">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>300</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">300</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="getInitialValues">true</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">300</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/registerAllKeysTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/registerAllKeysTest.xml b/src/tests/cpp/xml/Generics/Native/registerAllKeysTest.xml
deleted file mode 100644
index 093df9b..0000000
--- a/src/tests/cpp/xml/Generics/Native/registerAllKeysTest.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-	
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csNotifySubscription.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2h" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2h" argTypes="String,byte[]">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

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

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/ticket226.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/ticket226.xml b/src/tests/cpp/xml/Generics/Native/ticket226.xml
deleted file mode 100644
index f117d80..0000000
--- a/src/tests/cpp/xml/Generics/Native/ticket226.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="heapLruLimit">400</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>500</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="clientCount">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native/csAckMirror.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

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

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

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

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

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

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


Mime
View raw message