geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [38/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:17 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedRegion.xml b/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedRegion.xml
deleted file mode 100644
index 9dbd07b..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/csReplicatedRegion.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="TestTCR1">
-    <region-attributes  data-policy="replicate">
-    </region-attributes>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.RegionOperationsFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.ServerOperationsFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.RegionOperationsWithOutResultFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.ServerOperationsWithOutResultFunction</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/exceptionHandling.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/exceptionHandling.xml b/src/tests/cpp/xml/Generics/FunctionExecution/exceptionHandling.xml
deleted file mode 100644
index ed7802e..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/exceptionHandling.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="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-  	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="minServers">2</data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="partitionedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion2">
-    <snippet>
-      <region name="replicatedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="exceptionHandling" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedPR.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <!--task name="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion2</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">partitionedRegion</data>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">replicatedRegion</data>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteExceptionHandling" action="doExecuteExceptionHandling" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="20m" continueOnError="true" parallel="true" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>ParitionedRegionFunctionExecution</item>
-          <item>ReplicatedRegionFunctionExecution</item>
-          <item>FireAndForgetFunctionExecution</item>
-          <item>OnServersFunctionExcecution</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/functionExecutionHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/functionExecutionHA.xml b/src/tests/cpp/xml/Generics/FunctionExecution/functionExecutionHA.xml
deleted file mode 100644
index c610db1..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/functionExecutionHA.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="partitionedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegion2">
-    <snippet>
-      <region name="replicatedRegion">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="functionExecutionHA" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedPR.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <!--task name="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion2</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">partitionedRegion</data>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">replicatedRegion</data>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunctionWithHA" action="doExecuteExceptionHandling" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="20m" continueOnError="true" parallel="true" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>ParitionedRegionFunctionExecution</item>
-          <item>ReplicatedRegionFunctionExecution</item>
-          <item>FireAndForgetFunctionExecution</item>
-          <item>OnServersFunctionExcecution</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecHAWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecHAWithResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecHAWithResult.xml
deleted file mode 100644
index b168517..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecHAWithResult.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>30000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <client-set name="Feeder"/>
-  <data name="minServers">2</data>
-  <data name="getResult">true</data>
-  <data name="isResultCollector">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegionForFEHA.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctionsHA" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" parallel="true" waitTime="25m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="1" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="1" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="utils" timesToRun="1" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithOutResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithOutResult.xml
deleted file mode 100644
index 1af96f4..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithOutResult.xml
+++ /dev/null
@@ -1,108 +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="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">false</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithOutResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <!--task name="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithResult.xml
deleted file mode 100644
index 6d5e81b..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onRegionFunctionExecWithResult.xml
+++ /dev/null
@@ -1,108 +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="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="onRegionFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <!--task name="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithOutResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithOutResult.xml
deleted file mode 100644
index 0081b02..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithOutResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">false</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServer</data>
-	
-  <test name="onServerFunctionExecWithOutResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <!--task name="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>get</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithResult.xml
deleted file mode 100644
index cf0ee91..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onServerFunctionExecWithResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServer</data>
-	
-  <test name="onServerFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <!--task name="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>get</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithOutResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithOutResult.xml
deleted file mode 100644
index 0aced30..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithOutResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">false</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServers</data>
-	
-  <test name="onServersFunctionExecWithOutResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <!--task name="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithResult.xml b/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithResult.xml
deleted file mode 100644
index e59892b..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/onServersFunctionExecWithResult.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onServers</data>
-	
-  <test name="onServersFunctionExecWithResult" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csPartitionRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <!--task name="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/FunctionExecution/replicatedRegionExecution.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/FunctionExecution/replicatedRegionExecution.xml b/src/tests/cpp/xml/Generics/FunctionExecution/replicatedRegionExecution.xml
deleted file mode 100644
index 9310933..0000000
--- a/src/tests/cpp/xml/Generics/FunctionExecution/replicatedRegionExecution.xml
+++ /dev/null
@@ -1,109 +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="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="ThinClientPool1">
-   <snippet>
-     <pool name="_Test_Pool1" subscription-enabled="true" locators="true" />
-   </snippet>
-  </data-->
-  <data name="ThinClientRegion1">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-  <data name="getResult">true</data>
-  <data name="replicated">true</data>
-  <data name="poolName">_Test_Pool</data>
-  <data name="executionMode">onRegion</data>
-	
-  <test name="replicatedRegionExecution" description="Testing function execution APIs">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <!--task name="CreatePool1" action="doCreatePool" container="functionExecution" waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-    </task-->
-    <task name="CreateRegion1" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="3m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="10" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableIntTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableIntTest2.xml b/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableIntTest2.xml
deleted file mode 100644
index b5ccd53..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableIntTest2.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>80</item>
-      <item>160</item>
-      <item>320</item>
-      <item>640</item>
-      <item>1280</item>
-      <item>2560</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client Perf test with puts and gets for keyType int">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest.xml b/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest.xml
deleted file mode 100644
index 3e95afb..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-      <item>1000</item>
-      <item>10000</item>
-      <item>50000</item>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test with puts for mixed keyType">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keyType">int</data>
-    </task>
-    <task name="LocalDestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-<task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest2.xml b/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest2.xml
deleted file mode 100644
index c426df7..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTest2.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>80</item>
-      <item>160</item>
-      <item>320</item>
-      <item>640</item>
-      <item>1280</item>
-      <item>2560</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="CS3" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test with puts and gets for keyType string">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Measure Performance Variable with string keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="keySize">
-        <list>
-          <item>6</item>
-        </list>
-      </data>
-    </task>
-
-    <task name="Measure Performance Variable with cache size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-
-    <task name="StartCacheServers CS3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-
-    <task name="Measure Performance Variable with cache size with 3rd cache member" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="45m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="distinctKeys">
-        <list>
-          <item>1</item>
-          <item>100</item>
-          <item>10000</item>
-          <item>184877</item>
-        </list>
-      </data>
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput with 3rd cache member" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with payload size with 3rd cache member" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <data name="valueSizes">
-        <list>
-          <item>80</item>
-          <item>160</item>
-          <item>320</item>
-          <item>640</item>
-          <item>1280</item>
-          <item>2560</item>
-        </list>
-      </data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="StopCacheServers CS3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="CS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestIntWithHLRU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestIntWithHLRU.xml b/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestIntWithHLRU.xml
deleted file mode 100644
index be15503..0000000
--- a/src/tests/cpp/xml/Generics/Native/CyberTraderPerfVariableTestIntWithHLRU.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="heapLruLimit">100</data>
-  <data name="cacheType">CLIENT</data>
-
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>80</item>
-      <item>160</item>
-      <item>320</item>
-      <item>640</item>
-      <item>1280</item>
-      <item>2560</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test with HLRU for keyType int">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Native/csAckMirror.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-
-    <task name="CreateRegionForPerformanceVariable" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Measure Performance Variable with int keys" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="1h" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-    </task>
-
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Publisher"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="Int32,byte[]">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="Int32,byte[]">
-      <client-set name="Publisher"/>
-      <client-set name="Subscriber"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="Int32,byte[]"/>
-
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>


Mime
View raw message