http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/smoketest/scale/scale047.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale047.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale047.xml
deleted file mode 100644
index 832c4f5..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale047.xml
+++ /dev/null
@@ -1,134 +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">PSTObject</data>
-  <data name="clientCount">4</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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale047" description="Clients create replicated data on 
servers. Conserve sockets is true. Uses thread local connections.
-     Objects are DataSerializable PSTObjects 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/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 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,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Generate statistic spec" action="doRunProcess" 
container="utils" waitTime="5m">
-      <data name="program">cp</data>
-      <data 
name="arguments">../build_*/framework/xml/smoketest/scale/creates.spec 
statistics.spec</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m"/>
-    <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/scale048.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale048.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale048.xml
deleted file mode 100644
index 9e17927..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale048.xml
+++ /dev/null
@@ -1,137 +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>1480000</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">4</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"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale048" description="Clients get replicated data from servers. 
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/csMirrorDackSelector.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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,EqStruct"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Get Entries" action="doGetDataTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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/creategets.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/scale049.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale049.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale049.xml
deleted file mode 100644
index b9c30ac..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale049.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="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="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" 
max-connections="-1" servers="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale049" description="Clients put replicated data onto servers. 
Conserve sockets is true. 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/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,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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/createputs.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/scale050.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale050.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale050.xml
deleted file mode 100644
index 95e2cd3..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale050.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="encodeTimestamp">true</data>
-  <data name="isUpdateTrim">true</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">250000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" 
max-connections="-1" servers="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale050" description="Clients update replicated data on 
servers. Conserve sockets is false. 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/csMirrorDackSelector.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,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Put 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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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/createupdates.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/scale051.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale051.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale051.xml
deleted file mode 100644
index ae59810..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale051.xml
+++ /dev/null
@@ -1,131 +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>0</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="ObjectType">EqStructs</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" 
free-connection-timeout="10000000" read-timeout="10000000" max-connections="2" 
servers="true"/>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale051" description="Clients create partitioned data on 
servers. Conserve sockets is true. Limits pool size. 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=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,EqStruct"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,EqStruct"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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/creates.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/scale052.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale052.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale052.xml
deleted file mode 100644
index c5704a8..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale052.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2000000</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="encodeTimestamp">true</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">50</data>
-  <data name="AssetMaxVal">500000</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" 
max-connections="2" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale052.xml" description="Clients get partitioned data from 
servers. Conserve sockets is false. Uses selector. Limits pool size. 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/csPRRC1UseSelector.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,FastAssetAccount"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Get Entries" action="doGetDataTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,FastAssetAccount"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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/creategets.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/scale053.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale053.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale053.xml
deleted file mode 100644
index c10a1ac..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale053.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="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="keyType">int</data>
-  <data name="ObjectType">ArrayOfByte</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" thread-local-connections="false" 
max-connections="-1" 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"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale053" description="Clients put partitioned data onto 
servers. Conserve sockets is true. 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=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,ArrayOfByte"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,ArrayOfByte"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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/createputs.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/scale054.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale054.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale054.xml
deleted file mode 100644
index 6319c14..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale054.xml
+++ /dev/null
@@ -1,137 +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">4</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="2" 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"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale054" description="Clients create partitioned data on 
servers. Conserve sockets is false. Limits pool size. 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,PSTObject"  waitTime="5m">
-      <data name="statEnable">true</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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/createupdates.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/scale055.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale055.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale055.xml
deleted file mode 100644
index 119518b..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale055.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">240</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>2400000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>3</item>
-    </list>
-  </data>
-
- <<data name="keyType">int</data>
-  <data name="ObjectType">FastAssetAccount</data>
-  <data name="encodeTimestamp">true</data>
-  <data name="clientCount">4</data>
-  <data name="disableShufflingEP">true</data>
-  <data name="AssetAccountSize">25</data>
-  <data name="AssetMaxVal">600000</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"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale055" description="Clients use bulk ops to create replicated 
data on servers. 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/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 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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,FastAssetAccount"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,FastAssetAccount"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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/creates.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/scale056.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale056.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale056.xml
deleted file mode 100644
index 3653bda..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale056.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="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">EqStruct</data>
-  <data name="clientCount">4</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="2" 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"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
- <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale056" description="Clients use bulk ops to get replicated 
data from servers. Conserve sockets is false. Uses selector. Limits pool size. 
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/csMirrorDackSelector.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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,EqStruct"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Get Bulk Entries" action="doGetBulkDataTask" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,EqStruct"  waitTime="10m">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,EqStruct"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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/creategets.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/scale057.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/smoketest/scale/scale057.xml 
b/src/tests/cpp/xml/Generics/smoketest/scale/scale057.xml
deleted file mode 100644
index 9319306..0000000
--- a/src/tests/cpp/xml/Generics/smoketest/scale/scale057.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="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="keyType">int</data>
-  <data name="ObjectType">PSTObject</data>
-  <data name="clientCount">4</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"/>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set count="2" name="Client" hostGroup="CS2"/>
-  <client-set count="2" name="Client_" hostGroup="CS3"/>
-  <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="scale057" description="Clients use bulk ops to put replicated 
data onto servers. Conserve sockets is true. 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/csMirrorDackSelector.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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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="Client"/>
-      <client-set count="2" name="Client_"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </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="Client"/>
-      <client-set count="2" name="Client_"/>
-    </task>
-    <task name="Close Statistics" action="doCloseStatistic" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="Int32,PSTObject"  waitTime="5m">
-      <client-set count="2" name="Client"/>
-      <client-set count="2" 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/createputs.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>

Reply via email to