http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale083.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale083.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale083.xml
deleted file mode 100644
index 816c8e9..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale083.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">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>200000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaFastAssetAccount</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">50000</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" 
max-connections="-1" subscription-enabled="false" 
free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" cloning-enabled="false" 
pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" cloning-enabled="false" 
pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale083" description="Peer feeds update replicated data on peer 
datahosts and push updates to clients.  Uses delta propagation with 
cloningEnabled false.  Conserve sockets is true.  Uses selector.  
-  Objects are DataSerializable DeltaFastAssetAccounts with Instantiator 
containing 50 FastAssets each.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 
smoketest/scale/csMirrorDack5Selector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-     <task name="Put Delta Entries in Region" action="doUpdateScaleDeltaData" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <<client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/scale/updateupdateEvents.spec
 statistics.spec</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">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>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateScaleTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaFastAssetAccount"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale084.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale084.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale084.xml
deleted file mode 100644
index 3d24604..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale084.xml
+++ /dev/null
@@ -1,150 +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">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>200000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">DeltaPSTObject</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isCreatePerf">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" 
max-connections="-1" subscription-enabled="false" 
free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" cloning-enabled="false" 
pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,DeltaPSTObject"  
function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" cloning-enabled="false" 
pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
- <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-
-  <test name="scale084" description="Peer feeds update partitioned data on 
peer datahosts and push updates to clients.  Uses delta propagation with 
cloningEnabled false.  Conserve sockets is false.  Uses selector.  Objects are 
DataSerializable DeltaPSTObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 
smoketest/scale/csPRRC1Use5Selector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-     <task name="Put Delta Entries in Region" action="doUpdateScaleDeltaData" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <<client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/scale/updateupdateEvents.spec
 statistics.spec</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">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>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateScaleTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,DeltaPSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale085.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale085.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale085.xml
deleted file mode 100644
index 9e01561..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale085.xml
+++ /dev/null
@@ -1,154 +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">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>920000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isDurableReg">true</data> 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="true" 
max-connections="-1" subscription-enabled="false" 
free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,PSTObject"  
function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  
-  <test name="scale085" description="Peer feeds put replicated data onto peer 
datahosts and push updates to durable clients.  Conserve sockets is true.  Uses 
thread local connections.  Objects are DataSerializable PSTObjects of size 
1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csMirrorDack.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=true -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-     <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-   <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-      <task name="Put Entries in Region" action="doPutDataTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/scale/putupdateEvents.spec 
statistics.spec</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">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>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateScaleTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale086.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale086.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale086.xml
deleted file mode 100644
index 6066e19..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale086.xml
+++ /dev/null
@@ -1,154 +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">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isDurableReg">true</data> 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" 
max-connections="-1" subscription-enabled="false" 
free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-        <cache-listener library="smokeperf" argTypes="Int32,ArrayOfByte"  
function="createLatencyListener"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithOutListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Feeder" hostGroup="CS3"/>
-  <client-set count="8" name="Client" hostGroup="CS2"/>
-  <client-set name="JCS1" hostGroup="CS1"/>
-  <client-set name="JCS2" hostGroup="CS1"/>
-  <client-set name="JCS3" hostGroup="CS1"/>
-  <client-set name="JCS4" hostGroup="CS1"/>
-  
-  
-  <test name="scale086" description="Peer feeds put partitioned data onto peer 
datahosts and push updates to durable clients.  Conserve sockets is false.  
Uses default connection settings.  Objects are byte arrays of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 smoketest/scale/csPRRC1NoSelector.xml</data>
-      <data name="statEnable">false</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 1</data>
-      <client-set name="JCS1"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 2</data>
-      <client-set name="JCS2"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 3</data>
-      <client-set name="JCS3"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-N conserve-sockets=false -M 1500 -X 1500 -N 
-J-XX:+UseParNewGC -N -J-XX:+UseConcMarkSweepGC -N -J-XX:+DisableExplicitGC -N 
-J-XX:CMSInitiatingOccupancyFraction=33 4</data>
-      <client-set name="JCS4"/>
-    </task>
-     <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-     <task name="Open Statistic" action="doOpenStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <data name="isDurable">true</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-      <task name="Put Entries in Region" action="doPutDataTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="5m"/>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/scale/putupdateEvents.spec 
statistics.spec</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">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>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Generate Trim Spec" action="doGenerateScaleTrimSpec" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/subscription.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/subscription.list 
b/src/tests/cpp/xml/Generics/subscription.list
deleted file mode 100644
index 1bbb49c..0000000
--- a/src/tests/cpp/xml/Generics/subscription.list
+++ /dev/null
@@ -1,18 +0,0 @@
-Generics/hct/staticInterestPolicySingle.xml
-Generics/hct/staticInterestPolicySingleLateOps.xml
-Generics/hct/staticInterestPolicyList.xml
-Generics/hct/staticInterestPolicyListLateOps.xml
-Generics/hct/staticInterestPolicyAllKeys.xml
-Generics/hct/staticInterestPolicyAllKeysLateOps.xml
-#Generics/parReg/tx/staticInterestPolicySingle.xml
-#Generics/parReg/tx/staticInterestPolicySingleLateOps.xml
-#Generics/parReg/tx/staticInterestPolicyList.xml
-#Generics/parReg/tx/staticInterestPolicyListLateOps.xml
-#Generics/parReg/tx/staticInterestPolicyAllKeys.xml
-#Generics/parReg/tx/staticInterestPolicyAllKeysLateOps.xml
-Generics/parReg/subscription/staticInterestPolicySingle.xml
-Generics/parReg/subscription/staticInterestPolicySingleLateOps.xml
-Generics/parReg/subscription/staticInterestPolicyList.xml
-Generics/parReg/subscription/staticInterestPolicyListLateOps.xml
-Generics/parReg/subscription/staticInterestPolicyAllKeys.xml
-Generics/parReg/subscription/staticInterestPolicyAllKeysLateOps.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/entryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/entryEvent.xml 
b/src/tests/cpp/xml/Mcast/entryEvent.xml
deleted file mode 100644
index ade0a86..0000000
--- a/src/tests/cpp/xml/Mcast/entryEvent.xml
+++ /dev/null
@@ -1,149 +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="keySize">
-    <range low="4" high="12"/>
-  </data>
-  <client-set count="20" name="Client"/>
-  <data name="distinctKeys">10000</data>
-  <data name="valueSizes">low="0" high="8000"</data>
-  <!-- Number of add ops is equal to number of destroy ops -->
-  <data name="entryOps">
-    <oneof>
-      <item>add</item>
-      <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>localInvalidate</item>
-      <item>destroy</item>
-      <item>localDestroy</item>
-    </oneof>
-  </data>
-  <data name="opCount">
-    <range low="1" high="10"/>
-  </data>
-  <data name="workTime">120</data>
-  <data name="maxRegions">100</data>
-  
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  <test name="All" description="Entry Event test" waitTime="5400">
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" 
waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" 
waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" 
waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" 
waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" 
waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" 
waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">AckNmirrorNcacheNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" 
waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionSpec">NackNmirrorNcacheNil</data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" 
waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionName">MixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>AckNmirrorNil</item>
-          <item>AckMirrorNil</item>
-          <item>AckNmirrorNcacheNil</item>
-        </oneof>
-      </data>
-    </task>
-    <task name="doEntryOps" action="doEntryOperations" container="eventtest" 
waitTime="1200" continueOnError="true" threadCount="4">
-      <data name="regionName">MixedNil</data>
-      <data name="regionSpec">
-        <oneof>
-          <item>NackNmirrorNil</item>
-          <item>NackMirrorNil</item>
-          <item>NackNmirrorNcacheNil</item>
-        </oneof>
-      </data>
-    </task>
-  </test>
-</test-driver>
-

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/entryEventLong.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/entryEventLong.xml 
b/src/tests/cpp/xml/Mcast/entryEventLong.xml
deleted file mode 100755
index 0f29d6c..0000000
--- a/src/tests/cpp/xml/Mcast/entryEventLong.xml
+++ /dev/null
@@ -1,179 +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="keySize">
-               <range low="4" high="12"/>
-       </data>
-       <data name="distinctKeys">
-               10000
-       </data>
-       <data name="valueSizes">
-               <range low="0" high="8000"/>
-       </data>
-       <!-- Number of add ops is equal to number of destroy ops -->
-       <data name="entryOps">
-               <oneof>
-                       <item>add</item>
-                       <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>localInvalidate</item>
-                       <item>destroy</item>
-                       <item>localDestroy</item>
-               </oneof>
-       </data>
-       <data name="opCount">
-               <range low="1" high="10"/>
-       </data>
-       <data name="workTime">600</data>
-       <data name="preemptCounter">10</data>
-       <!-- abort, exit, done ops downcounter before execution -->
-       <data name="maxRegions">100</data>
-
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-       
-       <test name="AckMirrorNil" description="AckMirrorNil Entry Event test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" 
threadCount="4">
-                       <data name="regionSpec">AckMirrorNil</data>
-               </task>
-       </test>
-       
-       <test name="NackMirrorNil" description="NackMirrorNil Entry Event test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" 
threadCount="4">
-                       <data name="regionSpec">NackMirrorNil</data>
-               </task>
-       </test>
-       
-       <test name="AckNmirrorNil" description="AckNmirrorNil Entry Event test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" 
threadCount="4">
-                       <data name="regionSpec">AckNmirrorNil</data>
-               </task>
-       </test>
-       
-       <test name="NackNmirrorNil" description="NackNmirrorNil Entry Event 
test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" 
threadCount="4">
-                       <data name="regionSpec">NackNmirrorNil</data>
-               </task>
-       </test>
-       
-       <test name="AckNmirrorNcacheNil" description="AckNmirrorNcacheNil Entry 
Event test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" 
threadCount="4">
-                       <data name="regionSpec">AckNmirrorNcacheNil</data>
-               </task>
-       </test>
-       
-       <test name="NackNmirrorNcacheNil" description="NackNmirrorNcacheNil 
Entry Event test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" 
threadCount="4">
-                       <data name="regionSpec">NackNmirrorNcacheNil</data>
-               </task>
-       </test>
-       
-       <test name="MixedAckNil" description="MixedNil Entry Event test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" 
threadCount="4">
-                       <data name="regionName">MixedNil</data>
-                       <data name="regionSpec">
-                               <oneof>
-                                       <item>AckNmirrorNil</item>
-                                       <item>AckMirrorNil</item>
-                                       <item>AckNmirrorNcacheNil</item>
-                               </oneof>
-                       </data>
-               </task>
-       </test>
-       
-       <test name="MixedNackNil" description="MixedNil Entry Event test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" 
threadCount="4">
-                       <data name="regionName">MixedNil</data>
-                       <data name="regionSpec">
-                               <oneof>
-                                       <item>NackNmirrorNil</item>
-                                       <item>NackMirrorNil</item>
-                                       <item>NackNmirrorNcacheNil</item>
-                               </oneof>
-                       </data>
-               </task>
-       </test>
-       
-       <test name="Local" description="Local Entry Event test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" timesToRun="50" continueOnError="true" 
threadCount="4">
-                       <data name="regionSpec">Local</data>
-               </task>
-       </test>
-       
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/largeMembership.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/largeMembership.xml 
b/src/tests/cpp/xml/Mcast/largeMembership.xml
deleted file mode 100644
index 8cd3f1c..0000000
--- a/src/tests/cpp/xml/Mcast/largeMembership.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <client-set>
-    <client name="checker"/>
-  </client-set>
-  <client-set count="20" name="A"/>
-  <client-set count="20" name="B"/>
-  <client-set count="20" name="C"/>
-  <client-set count="20" name="D"/>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <test name="Distributed System" description="Distributed System test" 
waitTime="5400">
-    <task name="DistributedMemberCount" action="doDistributedMemberCount" 
container="eventtest" waitTime="600">
-    </task>
-    <task name="CreateRegion-AckMirrorNil" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">AckMirrorNil</data>
-      <data name="regionName">AckMirrorNil</data>
-    </task>
-    <task name="Verify CreateRegion-AckMirrorNil" action="doVerifyPeerCount" 
container="eventtest" waitTime="600">
-      <client-set>
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">AckMirrorNil</data>
-      <data name="regionName">AckMirrorNil</data>
-    </task>
-    <task name="CreateRegion-NackMirrorNil" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">NackMirrorNil</data>
-      <data name="regionName">NackMirrorNil</data>
-    </task>
-    <task name="Verify CreateRegion-NackMirrorNil" action="doVerifyPeerCount" 
container="eventtest" waitTime="600">
-      <client-set>
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">NackMirrorNil</data>
-      <data name="regionName">NackMirrorNil</data>
-    </task>
-    <task name="CreateRegion-AckNmirrorNil" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">AckNmirrorNil</data>
-      <data name="regionName">AckNmirrorNil</data>
-    </task>
-    <task name="Verify CreateRegion-AckNmirrorNil" action="doVerifyPeerCount" 
container="eventtest" waitTime="600">
-      <client-set>
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">AckNmirrorNil</data>
-      <data name="regionName">AckNmirrorNil</data>
-    </task>
-    <task name="CreateRegion-NackNmirrorNil" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">NackNmirrorNil</data>
-      <data name="regionName">NackNmirrorNil</data>
-    </task>
-    <task name="Verify CreateRegion-NackNmirrorNil" action="doVerifyPeerCount" 
container="eventtest" waitTime="600">
-      <client-set>
-        <client name="checker"/>
-      </client-set>
-      <data name="regionSpec">NackNmirrorNil</data>
-      <data name="regionName">NackNmirrorNil</data>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/mirrorGII.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/mirrorGII.xml 
b/src/tests/cpp/xml/Mcast/mirrorGII.xml
deleted file mode 100644
index f984738..0000000
--- a/src/tests/cpp/xml/Mcast/mirrorGII.xml
+++ /dev/null
@@ -1,52 +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">
-  <client-set count="20" name="A"/>
-  <data name="regionName">MirrorGII</data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="MirrorGII">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="MirrorGII">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="valueSizes">100</data>
-  <data name="EntryCount">100</data>
-  <data name="usePID">1</data>
-  <test name="MirrorGII" description="AckMirrorNilGII test" waitTime="2400">
-    <task name="CreateRegion-AckNmirrorNil" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="A_1"/>
-      </client-set>
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Populate-AckMirrorNil" action="doAddEntry" 
container="eventtest" waitTime="600">
-      <client-set exclude="true">
-        <client name="A_1"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-AckMirrorNil" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <client-set>
-        <client name="A_1"/>
-      </client-set>
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Verify" action="doVerifyKeyCount" container="eventtest" 
waitTime="600">
-      <client-set>
-        <client name="A_1"/>
-      </client-set>
-      <data name="expectedKeyCount">1900</data>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/netSearch.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/netSearch.xml 
b/src/tests/cpp/xml/Mcast/netSearch.xml
deleted file mode 100644
index 6bfb78b..0000000
--- a/src/tests/cpp/xml/Mcast/netSearch.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="EntryCount">10000</data>
-  <data name="valueSizes">1000</data>
-  <data name="usePID">1</data>  
-  <data name="regionName">NetSearchRegion</data>
-  <client-set>
-    <client name="Search"/>
-  </client-set>
-  <client-set count="19" name="Source"/>
-
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <test name="NetSearch" description="All regions are not mirrored, one of the 
is cachless. It does netsearch to get all data on each region"
-    waitTime="5400">
-    <task name="CreateSourceRegion-AckNmirrorNil" action="doCreateRootRegion" 
container="eventtest" waitTime="1200">
-      <data name="regionSpec">AckNmirrorNil</data>
-      <client-set count="19" name="Source"/>
-    </task>
-    <task name="CreateSearchRegion-AckNmirrorNcacheNil" 
action="doCreateRootRegion" container="eventtest" waitTime="1200">
-      <data name="regionSpec">AckNmirrorNcacheNil</data>
-      <client-set>
-        <client name="Search"/>
-      </client-set>
-    </task>
-    <task name="PopulateSources-AckNmirrorNil" action="doAddEntry" 
container="eventtest" waitTime="1200">
-      <client-set count="19" name="Source"/>
-    </task>
-    <task name="NetSearch" action="doNetSearch" container="eventtest" 
waitTime="3600">
-      <client-set>
-        <client name="Search"/>
-      </client-set>
-    </task>
-    <task name="RemoveRegion" action="doRemoveRootRegion" 
container="eventtest" waitTime="100">
-    </task>
-  </test>
-
-  <test name="NetSearch" description="All regions are not mirrored, one of the 
is cachless. It does netsearch to get all data on each region"
-    waitTime="5400">
-    <task name="CreateSourceRegion-NackNmirrorNil" action="doCreateRootRegion" 
container="eventtest" waitTime="1200">
-      <data name="regionSpec">NackNmirrorNil</data>
-      <client-set count="19" name="Source"/>
-    </task>
-    <task name="CreateSearchRegion-NackNmirrorNcacheNil" 
action="doCreateRootRegion" container="eventtest" waitTime="1200">
-      <data name="regionSpec">NackNmirrorNcacheNil</data>
-      <client-set>
-        <client name="Search"/>
-      </client-set>
-    </task>
-    <task name="PopulateSources-NackNmirrorNil" action="doAddEntry" 
container="eventtest" waitTime="1200">
-      <client-set count="19" name="Source"/>
-    </task>
-    <task name="NetSearch" action="doNetSearch" container="eventtest" 
waitTime="3600">
-      <client-set>
-        <client name="Search"/>
-      </client-set>
-    </task>
-    <task name="RemoveRegion" action="doRemoveRootRegion" 
container="eventtest" waitTime="100">
-    </task>
-  </test>
-
-</test-driver>
-

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/perfBenchmark.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/perfBenchmark.xml 
b/src/tests/cpp/xml/Mcast/perfBenchmark.xml
deleted file mode 100644
index d687f28..0000000
--- a/src/tests/cpp/xml/Mcast/perfBenchmark.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">120</data>
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-      <item>10</item>
-    </list>
-  </data>
-  
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set>
-    <client name="Producer"/>
-  </client-set>
-  <client-set count="19" name="Consumer"/>
-  <test name="AckMirrorNil" description="AckMirrorNil Entry Event test" 
waitTime="5400">
-    <task name="CreateRegion-AckMirrorNil" action="doCreateRegion" 
container="perftests" waitTime="1200">
-      <data name="regionSpec">AckMirrorNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-AckNmirrorNil" action="doCreateRegion" 
container="perftests" waitTime="1200">
-      <data name="regionSpec">AckNmirrorNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-AckNmirrorNcacheNil" action="doCreateRegion" 
container="perftests" waitTime="1200">
-      <data name="regionSpec">AckNmirrorNcacheNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="1200">
-    </task>
-    <task name="CreateLocal" action="doCreateRegion" container="perftests" 
waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-      <data name="regionSpec">Local</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-NackMirrorNil" action="doCreateRegion" 
container="perftests" waitTime="1200">
-      <data name="regionSpec">NackMirrorNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-NackNmirrorNil" action="doCreateRegion" 
container="perftests" waitTime="1200">
-      <data name="regionSpec">NackNmirrorNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="CreateRegion-NackNmirrorNcacheNil" action="doCreateRegion" 
container="perftests" waitTime="1200">
-      <data name="regionSpec">NackNmirrorNcacheNil</data>
-    </task>
-    <task name="Puts" action="doPuts" container="perftests" waitTime="1200">
-      <client-set>
-        <client name="Producer"/>
-      </client-set>
-    </task>
-    <task name="Gets" action="doGets" container="perftests" waitTime="1200">
-    </task>
-  </test>
-</test-driver>
-

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/regionContentTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/regionContentTest.xml 
b/src/tests/cpp/xml/Mcast/regionContentTest.xml
deleted file mode 100644
index 74cd630..0000000
--- a/src/tests/cpp/xml/Mcast/regionContentTest.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!-- Test for check get Initail Image 
and region content -->
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="valueSizes">100</data>
-  <data name="maxTestTime">10200</data>
-  <data name="workTime">300</data>
-  <data name="preemptCounter">10</data> <!-- abort, exit, done ops downcounter 
before execution -->
-  <data name="maxRegions">100</data> 
-  
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNilLstnr">
-    <snippet>
-      <region name="AckMirrorNilLstnr">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set count="20" name="Client"/>
-  <test name="CheckRegionContent" description="AckMirrorNil Validating Cache 
Content Test">
-    <task name="doCreateRootRgn" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNil</data>
-      <client-set exclude="true">
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateRootRgn" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    
-    <task name="PopulateRegion" action="doAddEntry" container="eventtest" 
waitTime="600">
-      <data name="EntryCount">100000</data>
-      <data name="regionName">DistRegionA</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateLocalRgn" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <data name="regionName">LocalRegionA</data>
-      <data name="regionSpec">Local</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doIterateOnEntry" action="doIterateOnEntry" 
container="eventtest" waitTime="600">
-      <data name="testRegion">DistRegionA</data>
-      <data name="validateRegion">LocalRegionA</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="regionContentValidation" action="doValidateRegionContent" 
container="eventtest"
-      waitTime="1200">
-      <data name="testRegion">DistRegionA</data>
-      <data name="validateRegion">LocalRegionA</data>
-      <data name="regionName">DistRegionA</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-  </test>
-  <test name="CheckRegionContent" description="AckNmirrorNil Validating Cache 
Content Test">
-    <task name="doCreateRootRgn" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA2</data>
-      <data name="regionSpec">AckNmirrorNil</data>
-      <client-set exclude="true">
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateRootRgn" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <data name="regionName">DistRegionA2</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doCreateLocalRgn" action="doCreateRootRegion" 
container="eventtest" waitTime="600">
-      <data name="regionName">LocalRegionA2</data>
-      <data name="regionSpec">Local</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="PopulateRegion" action="doAddEntry" container="eventtest" 
waitTime="600">
-      <data name="EntryCount">10000</data>
-      <data name="usePID">1</data>
-      <data name="regionName">DistRegionA2</data>
-      <client-set exclude="true">
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="doIterateOnEntry" action="doIterateOnEntry" 
container="eventtest" waitTime="600">
-      <data name="testRegion">DistRegionA2</data>
-      <data name="validateRegion">LocalRegionA2</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-    <task name="regionContentValidation" action="doValidateRegionContent" 
container="eventtest"
-      waitTime="1200">
-      <data name="testRegion">DistRegionA2</data>
-      <data name="validateRegion">LocalRegionA2</data>
-      <data name="regionName">DistRegionA2</data>
-      <data name="regionSpec">AckMirrorNilLstnr</data>
-      <client-set>
-        <client name="Client_1"/>
-      </client-set>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Mcast/regionEventMT.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Mcast/regionEventMT.xml 
b/src/tests/cpp/xml/Mcast/regionEventMT.xml
deleted file mode 100644
index bc11665..0000000
--- a/src/tests/cpp/xml/Mcast/regionEventMT.xml
+++ /dev/null
@@ -1,166 +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="regionOps">
-               <oneof>
-                       <item>addRegion</item>
-                       <item>addRegion</item>
-                       <item>addRegion</item>
-                       <item>addRegion</item>
-                       <item>invalidateRegion</item>
-                       <item>destroyRegion</item>
-                       <item>localInvalidateRegion</item>
-                       <item>localDestroyRegion</item>
-                       <!-- <item>abort</item>  seg v -->
-                       <!-- <item>exit</item>    exit(0) -->
-                       <!-- <item>done</item>  leave doOperation, exit while 
loop -->
-               </oneof>
-       </data>
-       <data name="regionPaths">
-               <oneof>
-                       <item>/RR1/R1/R2</item>
-                       <item>/RR2/R1/R2</item>
-                       <item>/RR3/R1/R2</item>
-                       <item>/RR4/R1/R2</item>
-                       <item>/RR5/R1/R2</item>
-               </oneof>
-       </data>
-  <client-set count="20" name="Client"/>
-       <data name="randomOP"> 5 </data>
-       <data name="workTime">30</data>
-       <data name="preemptCounter">10</data>
-       <data name="initRegionNumObjects">10</data>
-       <!-- abort, exit, done ops downcounter before execution -->
-       <data name="maxRegions">10</data>
-
-  <data name="Local">
-    <snippet>
-      <region name="Local">
-        <region-attributes scope="local"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="AckMirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackMirrorNil">
-    <snippet>
-      <region name="NackMirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="NackNmirrorNcacheNil">
-    <snippet>
-      <region name="NackNmirrorNil">
-        <region-attributes scope="distributed-no-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNcacheNil">
-    <snippet>
-      <region name="AckNmirrorNil">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="false" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-       
-       <test name="Local" description="Local Entry Event test">
-               <task name="doRegionOps" action="doRegionOperations" 
container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-                       <data name="regionSpec">Local</data>
-               </task>
-       </test>
-       
-       <test name="AckMirrorNil" description="AckMirrorNil Entry Event test">
-               <task name="doRegionOps" action="doRegionOperations" 
container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-                       <data name="regionSpec">AckMirrorNil</data>
-               </task>
-       </test>
-       
-       <test name="NackMirrorNil" description="NackMirrorNil Entry Event test">
-               <task name="doRegionOps" action="doRegionOperations" 
container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-                       <data name="regionSpec">NackMirrorNil</data>
-               </task>
-       </test>
-       
-       <test name="AckNmirrorNil" description="AckNmirrorNil Entry Event test">
-               <task name="doRegionOps" action="doRegionOperations" 
container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-                       <data name="regionSpec">AckNmirrorNil</data>
-               </task>
-       </test>
-       
-       <test name="NackNmirrorNil" description="NackNmirrorNil Entry Event 
test">
-               <task name="doRegionOps" action="doRegionOperations" 
container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-                       <data name="regionSpec">NackNmirrorNil</data>
-               </task>
-       </test>
-                       
-       <test name="AckNmirrorNcacheNil" description="AckNmirrorNcacheNil Entry 
Event test">
-               <task name="doRegionOps" action="doRegionOperations" 
container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-                       <data name="regionSpec">AckNmirrorNcacheNil</data>
-               </task>
-       </test>
-       
-       <test name="NackNmirrorNcacheNil" description="NackNmirrorNcacheNil 
Entry Event test">
-               <task name="doRegionOps" action="doRegionOperations" 
container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-                       <data name="regionSpec">NackNmirrorNcacheNil</data>
-               </task>
-       </test>
-       
-       <test name="MixedNil" description="MixedNil Entry Event test">
-               <task name="doRegionOps" action="doRegionOperations" 
container="eventtest" waitTime="500"  continueOnError="true" threadCount="4">
-                       <data name="regionName">MixedNil</data>
-                       <data name="regionSpec">
-                               <oneof>
-                                       <item>NackNmirrorNil</item>
-                                       <item>NackMirrorNil</item>
-                                       <item>AckNmirrorNil</item>
-                                       <item>AckMirrorNil</item>
-                                       <item>NackNmirrorNcacheNil</item>
-                                       <item>AckNmirrorNcacheNil</item>
-                               </oneof>
-                       </data>
-               </task>
-       </test> 
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/Deprecated/dsMemberCount.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/Deprecated/dsMemberCount.xml 
b/src/tests/cpp/xml/Misc/Deprecated/dsMemberCount.xml
deleted file mode 100755
index e1c92f2..0000000
--- a/src/tests/cpp/xml/Misc/Deprecated/dsMemberCount.xml
+++ /dev/null
@@ -1,47 +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="maxTestTime">6000</data>
-       <data name="minTaskGranularitySec">30</data>
-       <data name="totalTaskTimeSec">1200</data>
-       <data name="maxResultWaitSec">600</data>
-       <data name="preemptCounter">10</data>
-       <!-- abort, exit, done ops downcounter before execution -->
-       <data name="haltIfBadResult">true</data>
-       <data name="maxRegions">50</data>
-       <data name="installListener">true</data>
-       <data name="installWriter">false</data>
-       <data name="installLoader">false</data>
-       <data-set name="Local">
-               <data name="regionName">Local</data>
-               <data name="scope">local</data>
-       </data-set>
-       <data-set name="AckMirrorNil">
-               <data name="regionName">AckMirrorNil</data>
-               <data name="scope">ack</data>
-               <data name="mirroring">true</data>
-               <data name="interestListEnabled">false</data>
-       </data-set>
-       <data-set name="NackMirrorNil">
-               <data name="regionName">NackMirrorNil</data>
-               <data name="scope">nack</data>
-               <data name="mirroring">true</data>
-               <data name="interestListEnabled">false</data>
-       </data-set>
-       <data-set name="AckNmirrorNil">
-               <data name="regionName">AckNmirrorNil</data>
-               <data name="scope">ack</data>
-               <data name="mirroring">false</data>
-               <data name="interestListEnabled">false</data>
-       </data-set>
-       <data-set name="NackNmirrorNil">
-               <data name="regionName">NackNmirrorNil</data>
-               <data name="scope">nack</data>
-               <data name="mirroring">false</data>
-               <data name="interestListEnabled">false</data>
-       </data-set>
-       
-        <test name="Local" description="Local Event test" waitTime="780">
-           <task name="DistributedMemberCount" 
action="doDistributedMemberCount" container="eventtest" waitTime="60" 
timesToRun="5" continueOnError="true">
-            </task>
-        </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/VerifyPeerRegionCount.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/VerifyPeerRegionCount.xml 
b/src/tests/cpp/xml/Misc/VerifyPeerRegionCount.xml
deleted file mode 100644
index dd73268..0000000
--- a/src/tests/cpp/xml/Misc/VerifyPeerRegionCount.xml
+++ /dev/null
@@ -1,26 +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="regionName">TestRegion</data>
-
-  <test name="VerifyPeerRegionCount"
-      description="Verify that peers for a region can see each other">
-
-    <task name="CreatePeerRegions"
-        action="doCreateRegion"
-        container="vpc"
-        waitTime="2m"/>
-
-    <task name="CountPeers"
-        action="doVerifyPeerCount"
-        container="vpc"
-        waitTime="2m"/>
-
-    <task name="DestroyPeerRegions"
-        action="doDestroyRegion"
-        container="vpc"
-        waitTime="2m"/>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/cacheContentTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/cacheContentTest.xml 
b/src/tests/cpp/xml/Misc/cacheContentTest.xml
deleted file mode 100755
index e14a30d..0000000
--- a/src/tests/cpp/xml/Misc/cacheContentTest.xml
+++ /dev/null
@@ -1,124 +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="keySize">
-               <range low="4" high="12"/>
-       </data>
-       <data name="distinctKeys">
-               10000
-       </data>
-       <data name="valueSizes">
-               <range low="0" high="10000"/>
-       </data>
-       <data name="entryOps">
-               <oneof>
-                       <item>add</item>
-                       <item>add</item>
-                       <item>add</item>
-                       <item>add</item>
-                       <item>done</item>
-                       
-               </oneof>
-       </data>
-       <data name="opCount">
-               <range low="1" high="10"/>
-       </data>
-       <data name="maxTestTime">10200</data>
-       <data name="workTime">300</data>
-       <data name="preemptCounter">10</data>
-       <!-- abort, exit, done ops downcounter before execution -->
-       <data name="maxRegions">100</data>
-
-  <data name="AckMirrorNil">
-    <snippet>
-      <region name="RegionA">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="Validate">
-    <snippet>
-      <region name="RegionB">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="AckNmirrorNil">
-    <snippet>
-      <region name="RegionC">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-  <data name="ValidateNonMirror">
-    <snippet>
-      <region name="RegionD">
-        <region-attributes scope="distributed-ack" mirroring="false" 
-          caching-enabled="true" interest-list-enabled="false">
-          <cache-listener library="eventtest" 
function="createETCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  
-       <client-set name="CacheChecker">
-         <client name="ClientA"/>
-       </client-set>
-
-       
-       <test name="CheckCacheContent" description="AckMirrorNil Validating 
Cache Content Test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" continueOnError="true" >
-                   <data name="regionName">RegionA</data>
-                   <data name="regionSpec">AckMirrorNil</data>
-               </task>
-               <task name="doCreateRootRgn" action="doCreateRootRegion" 
container="eventtest" waitTime="1200" continueOnError="true" >
-                   <data name="regionName">RegionB</data>
-                   <data name="regionSpec">Validate</data>
-               </task>
-              <task name="doIterateOnEntry" action="doIterateOnEntry" 
container="eventtest" waitTime="1200" continueOnError="true">
-                   <data name="testRegion">RegionA</data>
-                   <data name="validateRegion">RegionB</data>
-                   <client-set ><client name="ClientA"/></client-set>
-              </task>
-              <task name="checkCacheContent" action="doValidateCacheContent" 
container="eventtest" waitTime="1200" continueOnError="true">
-                   <data name="testRegion">RegionA</data>
-                   <data name="validateRegion">RegionB</data>
-                   <client-set exclude="true"><client 
name="ClientA"/></client-set>
-              </task>
-       </test>
-       <test name="CheckNmirrorCacheContent" description="AckNonMirrorNil 
validating Cache content Test">
-               <task name="doEntryOps" action="doEntryOperations" 
container="eventtest" waitTime="1200" continueOnError="true" >
-                   <data name="regionName">RegionC</data>
-                   <data name="regionSpec">AckNmirrorNil</data>
-               </task>
-               <task name="doCreateRootRgn" action="doCreateRootRegion" 
container="eventtest" waitTime="1200" continueOnError="true" >
-                   <data name="regionName">RegionD</data>
-                   <data name="regionSpec">ValidateNonMirror</data>
-               </task>
-               <!--task name="addEntry" action="doAddEntry" 
container="eventtest" waitTime="1200" continueOnError="true" >
-                   <data name="regionName">RegionC</data>
-                   <data name="regionSpec">AckNmirrorNil</data>
-               </task-->
-              <task name="doIterateOnEntry" action="doIterateOnEntry" 
container="eventtest" waitTime="1200" continueOnError="true">
-                   <data name="testRegion">RegionC</data>
-                   <data name="validateRegion">RegionD</data>
-                   <client-set ><client name="ClientA"/></client-set>
-              </task>
-              <task name="checkCacheContent" action="doValidateCacheContent" 
container="eventtest" waitTime="1200" continueOnError="true">
-                   <data name="testRegion">RegionC</data>
-                   <data name="validateRegion">RegionD</data>
-                   <client-set exclude="true"><client 
name="ClientA"/></client-set>
-              </task>
-       </test>
-</test-driver>

Reply via email to