geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [36/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:15 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/failoverTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/failoverTest.xml b/src/tests/cpp/xml/Generics/Native/failoverTest.xml
deleted file mode 100644
index 4b7d3bc..0000000
--- a/src/tests/cpp/xml/Generics/Native/failoverTest.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">15m</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>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 count="10" 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/csAckMirrorQsize.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="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="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 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="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="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="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 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>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/getAllTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/getAllTest.xml b/src/tests/cpp/xml/Generics/Native/getAllTest.xml
deleted file mode 100644
index 42f3faf..0000000
--- a/src/tests/cpp/xml/Generics/Native/getAllTest.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">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>1</item>
-    </list>
-  </data>
-  <data name="expectedCount">100000</data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="150000" 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"/>
-  <client-set name="Subscriber2"/>
-
-  <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="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</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="Publisher"/>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>2000</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </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="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="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests"  timesToRun="3" waitTime="15m" parallel="true" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests"  timesToRun="3" waitTime="15m" parallel="true" argTypes="String,byte[]">
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-      <data name="invalidateRegion">true</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">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/perfBenchmarkTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfBenchmarkTCR.xml b/src/tests/cpp/xml/Generics/Native/perfBenchmarkTCR.xml
deleted file mode 100644
index 7db492d..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfBenchmarkTCR.xml
+++ /dev/null
@@ -1,207 +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>5000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</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 count="2" name="ThinClient"/>
-  <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 count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <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="Gets-identical" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Puts-identical" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Destroys-identical" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </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="Gets-overlap1" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-overlap2" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">2500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-overlap1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-overlap2" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">2500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-overlap1" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-overlap2" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>7500</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">2500</data>
-    </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="Gets-non-overlap1" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-non-overlap2" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">5000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Puts-non-overlap1" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-non-overlap2" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">5000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Destroys-non-overlap1" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2h" parallel="true" argTypes="Int32,byte[]">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-non-overlap2" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2h" parallel="true" argTypes="Int32,byte[]">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>5000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">5000</data>
-    </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/Native/perfClientsUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfClientsUpdateTest.xml b/src/tests/cpp/xml/Generics/Native/perfClientsUpdateTest.xml
deleted file mode 100644
index 48aa9c3..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfClientsUpdateTest.xml
+++ /dev/null
@@ -1,97 +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>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>1000</item>
-      <item>100</item>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</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="JCS" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <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/csAckMirrorQsize.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 count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="Int32,byte[]">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Puts" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="90m" argTypes="Int32,byte[]">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="IterateKeys" action="doIterateInt32Keys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" 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/Native/perfCyberTraderLatencyPut.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfCyberTraderLatencyPut.xml b/src/tests/cpp/xml/Generics/Native/perfCyberTraderLatencyPut.xml
deleted file mode 100644
index 7c58977..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfCyberTraderLatencyPut.xml
+++ /dev/null
@@ -1,123 +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="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-      <!--item>1000</item>
-      <item>10000</item>
-      <item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-      <item>5000</item>
-      <item>10000</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="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListenerP"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </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/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="regionSpec">ThinClientRegionListener</data>
-    </task>
-    <task name="Measure Put doLatencyPuts" action="doLatencyPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="regionSpec">ThinClientRegionListener</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="PutEntries" action="doLatencyPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </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/perfCyberTraderPutGetThroughput.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfCyberTraderPutGetThroughput.xml b/src/tests/cpp/xml/Generics/Native/perfCyberTraderPutGetThroughput.xml
deleted file mode 100644
index dd12b8d..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfCyberTraderPutGetThroughput.xml
+++ /dev/null
@@ -1,112 +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="keySize">
-    <list>
-      <item>16</item>
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <item>1000</item>
-      <item>5000</item>
-      <item>10000</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="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/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </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="JCS1"/>
-    </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="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Destroys Entries" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2h" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="PutEntries" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="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/perfTCROverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTCROverflowToDisk.xml b/src/tests/cpp/xml/Generics/Native/perfTCROverflowToDisk.xml
deleted file mode 100644
index 6857be7..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTCROverflowToDisk.xml
+++ /dev/null
@@ -1,113 +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="keySize">
-    <list>
-      <item>16</item>
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-      <item>1000</item>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-      <item>100</item>
-      <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="false" client-notification="false"/>
-      </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/csServerOverflowToDisk.xml</data>
-      <client-set name="JCS1"/>
-    </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="JCS1"/>
-    </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="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"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <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="45m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" 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/perfTCRServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTCRServerEviction.xml b/src/tests/cpp/xml/Generics/Native/perfTCRServerEviction.xml
deleted file mode 100644
index c479cb4..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTCRServerEviction.xml
+++ /dev/null
@@ -1,111 +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="keySize">
-    <list>
-      <item>16</item>
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <!-- item>100</item>
-      <item>1000</item -->
-      <item>10000</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="false" client-notification="false"/>
-      </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 Generics/Native/csServerOverflowToDisk.xml</data>
-      <client-set name="JCS1"/>
-    </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="JCS1"/>
-    </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="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="3m" argTypes="String,byte[]">
-      <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="7m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="7m" 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/perfTestPutGetDestroyTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCR.xml b/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCR.xml
deleted file mode 100644
index cd43d0f..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCR.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="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <!--item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-             <!--item>5000</item>
-             <item>10000</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="false" client-notification="false"/>
-      </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/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="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"/>
-    </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 Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <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="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="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" 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/perfTestPutGetDestroyTCRscaledUp.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCRscaledUp.xml b/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCRscaledUp.xml
deleted file mode 100644
index ec3fc87..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroyTCRscaledUp.xml
+++ /dev/null
@@ -1,162 +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="keySize">
-    <list>
-      <item>16</item>
-      <!--item>32</item>
-      <item>64</item>
-      <item>128</item>
-      <item>256</item-->
-    <!--range low="10" high="256"/-->
-    </list>
-  </data>
-  
-
-  <data name="distinctKeys">
-    <list>
-      <item>10</item>
-      <item>1000</item>
-      <item>10000</item>
-      <!--item>100000</item>
-      <item>184877</item-->
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-             <!--item>5000</item>
-             <item>10000</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="false" client-notification="false"/>
-      </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"/>
-  <client-set name="Putter3"/>
-  <client-set name="Getter3"/>
-  <client-set name="Destroyer3"/>
-  <client-set name="Putter4"/>
-  <client-set name="Getter4"/>
-  <client-set name="Destroyer4"/>
-	
-  <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/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="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Destroyer1"/>
-    </task>
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="5m">
-      <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" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Destroyer2"/>
-    </task>
-	   <!-- create region and measure throughput for putter,getter,destroyer - 3 -->
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="5m">
-      <client-set name="Putter3"/>
-      <client-set name="Getter3"/>
-      <client-set name="Destroyer3"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Putter3"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Getter3"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Destroyer3"/>
-    </task>
-	   <!-- create region and measure throughput for putter,getter,destroyer - 4 -->
-	
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="5m">
-      <client-set name="Putter4"/>
-      <client-set name="Getter4"/>
-      <client-set name="Destroyer4"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Putter4"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Getter4"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" waitTime="30m">
-      <client-set name="Destroyer4"/>
-    </task>
-	   <!-- stopping all the 4 servers -->
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" argTypes="String,byte[]" 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="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/perfTestPutGetDestroy_FullInterestTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_FullInterestTCR.xml b/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_FullInterestTCR.xml
deleted file mode 100644
index c92cb21..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_FullInterestTCR.xml
+++ /dev/null
@@ -1,141 +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="2m" 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="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </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>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="15m" 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="15m" 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="15m" 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="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 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/perfTestPutGetDestroy_PartialInterestTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_PartialInterestTCR.xml b/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_PartialInterestTCR.xml
deleted file mode 100644
index e441b77..0000000
--- a/src/tests/cpp/xml/Generics/Native/perfTestPutGetDestroy_PartialInterestTCR.xml
+++ /dev/null
@@ -1,142 +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="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="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 Interest List" action="doRegisterInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-    </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>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="15m" 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="15m" argTypes="String,byte[]">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">25000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 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/putGetAllTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/putGetAllTest.xml b/src/tests/cpp/xml/Generics/Native/putGetAllTest.xml
deleted file mode 100644
index 5e74d87..0000000
--- a/src/tests/cpp/xml/Generics/Native/putGetAllTest.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="expectedCount">100000</data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="150000" 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"/>
-  <client-set name="Subscriber2"/>
-
-  <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="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</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="Publisher"/>
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPutAll" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Update Entries from Publisher" action="doPutAll" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <data name="valueSizes">
-        <list>
-          <item>2000</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">1000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Local destroy region" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </task>
-    <task name="CreateRegion again" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <client-set name="Subscriber2"/>
-    </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="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="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests"  timesToRun="3" waitTime="15m" parallel="true" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">false</data>
-    </task>
-    <task name="Verify getAll list" action="doGetAllAndVerification" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests"  timesToRun="3" waitTime="15m" parallel="true" argTypes="String,byte[]">
-      <client-set name="Subscriber2"/>
-      <data name="valueSizes">2000</data>
-      <data name="addToLocalCache">true</data>
-      <data name="invalidateRegion">true</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">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-</test-driver>


Mime
View raw message