geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [15/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:22:54 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale073.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale073.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale073.xml
deleted file mode 100644
index f2faccc..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale073.xml
+++ /dev/null
@@ -1,152 +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>1000000</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">FastAssetAccount</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">250000</data>
-  <data name="isUpdateTrim">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,FastAssetAccount"  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="scale073" description="Peer feeds update replicated data on peer datahosts and push updates to clients.  Conserve sockets is true.  Uses selector.  Objects are DataSerializable FastAssetAccounts 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,FastAssetAccount"  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,FastAssetAccount"  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,FastAssetAccount"  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,FastAssetAccount"  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,FastAssetAccount"  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,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-      <task name="Update Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  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,FastAssetAccount"  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,FastAssetAccount"  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,FastAssetAccount"  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/scale074.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale074.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale074.xml
deleted file mode 100644
index e28da74..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale074.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>4800000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>512</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="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" 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="scale074" description="Peer feeds create partitioned data on peer datahosts and push updates to clients.  Conserve sockets is false.  Uses default connection settings.  Objects are byte arrays of size 512.">
-    <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 2000 -X 2000 -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 2000 -X 2000 -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 2000 -X 2000 -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 2000 -X 2000 -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"/>
-      <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="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/createupdateEvents.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/smoketest/scale/scale075.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale075.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale075.xml
deleted file mode 100644
index d79dadb..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale075.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="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">PSTObject</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">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="scale075" description="Peer feeds put partitioned data onto peer datahosts and push updates to 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/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=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"/>
-      <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/scale076.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale076.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale076.xml
deleted file mode 100644
index 54fa645..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale076.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>3000000</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">EqStruct</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="isUpdateTrim">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,EqStruct"  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="scale076" description="Peer feeds update partitioned data on peer datahosts and push updates to clients.  Conserve sockets is false.  Uses default connection settings.  Objects are DataSerializable EqStructs">
-    <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,EqStruct"  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,EqStruct"  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,EqStruct"  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,EqStruct"  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,EqStruct"  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,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-      <task name="Update Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  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,EqStruct"  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,EqStruct"  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,EqStruct"  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/scale077.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale077.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale077.xml
deleted file mode 100644
index 30912db..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale077.xml
+++ /dev/null
@@ -1,147 +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>2400000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>512</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="bulkOpMapSize">1000</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="scale077" description="Peer feeds use bulk ops to create replicated data on peer datahosts and push updates to clients.  Conserve sockets is true.  Uses selector.  Objects are byte arrays of size 512.">
-    <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 2000 -X 2000 -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 2000 -X 2000 -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 2000 -X 2000 -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 2000 -X 2000 -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"/>
-      <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 bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,ArrayOfByte"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</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/createupdateEvents.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/smoketest/scale/scale078.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale078.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale078.xml
deleted file mode 100644
index 9724ee8..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale078.xml
+++ /dev/null
@@ -1,151 +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>700000</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">EqStruct</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="bulkOpMapSize">1000</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,EqStruct"  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="scale078" description="Peer feeds use bulk ops to put replicated data onto peer datahosts and push updates to clients.  Conserve sockets is false.  Uses selector. Uses thread local connections.  Objects are DataSerializable EqStructs">
-    <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=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,EqStruct"  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,EqStruct"  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,EqStruct"  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,EqStruct"  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,EqStruct"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-     <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Put bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,EqStruct"  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,EqStruct"  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,EqStruct"  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,EqStruct"  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/scale079.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale079.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale079.xml
deleted file mode 100644
index 329aafc..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale079.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>4400000</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">FastAssetAccount</data>
-  <data name="clientCount">2</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">25</data>
-  <data name="AssetMaxVal">1100000</data>
-  <data name="isUpdateTrim">true</data>
-  <data name="bulkOpMapSize">1000</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,FastAssetAccount"  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="scale079" description="Peer feeds use bulk ops to create partitioned data on peer datahosts and push updates to clients.  Conserve sockets is true.  Uses thread local connections.  Objects are DataSerializable FastAssetAccounts with Instantiator containing 25 FastAssets each.">
-    <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=true -M 2000 -X 2000 -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 2000 -X 2000 -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 2000 -X 2000 -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 2000 -X 2000 -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,FastAssetAccount"  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,FastAssetAccount"  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,FastAssetAccount"  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,FastAssetAccount"  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,FastAssetAccount"  waitTime="2m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="8" name="Client"/>
-    </task>
-   <task name="Create bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,FastAssetAccount"  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,FastAssetAccount"  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/createupdateEvents.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,FastAssetAccount"  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/scale080.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale080.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale080.xml
deleted file mode 100644
index bd32a95..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale080.xml
+++ /dev/null
@@ -1,151 +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>1920000</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="bulkOpMapSize">1000</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="scale080" description="Peer feeds use bulk ops to put partitioned data onto peer datahosts and push updates to clients.  Conserve sockets is false.  Uses selector. 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/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,PSTObject"  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,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 bulk Entries in Region" action="doCreateOrPutBulkDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,PSTObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCreateAll">true</data>
-      <client-set count="2" name="Feeder"/>
-    </task>
-    <task name="Put bulk Entries in Region" action="doCreateOrPutBulkDataTask" 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/scale081.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale081.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale081.xml
deleted file mode 100644
index f0e0975..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale081.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
- <data name="BatchSize">
-    <list>
-      <item>160000</item>
-    </list>
-  </data>
-  <data name="keyType">int</data>
-  <data name="ObjectType">BatchObject</data>
-  <data name="numCQs">1</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="true" max-connections="-1" subscription-enabled="false" free-connection-timeout="10000000" read-timeout="10000000" servers="true" />
-    </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="scale081" description="Peer feeds put replicated data onto peer datahosts and push updates to clients with CQs returning 20% of the keys.  Conserve sockets is true.  Uses thread local connections.  Objects are DataSerializable BatchObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH  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,BatchObject"  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,BatchObject"  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,BatchObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-     <task name="Register continuously Query" action="doRegisterCQs" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="executeWithInitialResults">false</data>
-      <client-set count="8" name="Client"/>
-     </task> 
-      <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  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,BatchObject"  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,BatchObject"  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,BatchObject"  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/scale082.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale082.xml b/src/tests/cpp/xml/Generics/smoketest/scale/scale082.xml
deleted file mode 100644
index dfb9c98..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale082.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>1100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-  <data name="BatchSize">
-    <list>
-      <item>220000</item>
-    </list>
-  </data>
-  <data name="keyType">int</data>
-  <data name="ObjectType">BatchObject</data>
-  <data name="numCQs">1</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="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="scale082" description="Peer feeds put partitioned data onto peer datahosts and push updates to clients with CQs returning 20% of the keys.  Conserve sockets is false.  Uses default connection settings.  Objects are DataSerializable BatchObjects of size 1024.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH  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,BatchObject"  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,BatchObject"  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,BatchObject"  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,BatchObject"  waitTime="5m">
-      <client-set count="2" name="Feeder"/>
-      <client-set count="8" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithOutListener</data>
-    </task>
-    <task name="Create Entries in Region" action="doCreateData" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Feeder"/>
-     </task>
-     <task name="Register continuously Query" action="doRegisterCQs" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  waitTime="20m">
-      <data name="regionName">TestTCR1</data>
-      <data name="executeWithInitialResults">false</data>
-      <client-set count="8" name="Client"/>
-     </task> 
-      <task name="Put Entries in Region" action="doPutDataTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="Int32,BatchObject"  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,BatchObject"  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,BatchObject"  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,BatchObject"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-  </test>
-
-</test-driver>


Mime
View raw message