geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [43/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:22 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/csFEPartitionedRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csFEPartitionedRegion.xml b/src/tests/cpp/xml/FunctionExecution/csFEPartitionedRegion.xml
deleted file mode 100644
index dd8c30f..0000000
--- a/src/tests/cpp/xml/FunctionExecution/csFEPartitionedRegion.xml
+++ /dev/null
@@ -1,36 +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="dummy">
-    <region-attributes  data-policy="normal">
-    </region-attributes>
-    <entry>
-      <key><string>1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.PSTObject</class-name>
-          <parameter name="field1">
-            <string>1</string>
-          </parameter>
-        </declarable>
-      </value>
-    </entry>
-  </region>
-  <region name="TestTCR1">
-     <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="1" total-num-buckets="10"/>
-     </region-attributes>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.GetKeyFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.PutKeyFunction</class-name>
-    </function>
-   
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/csPartitionRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csPartitionRegion.xml b/src/tests/cpp/xml/FunctionExecution/csPartitionRegion.xml
deleted file mode 100755
index 7726866..0000000
--- a/src/tests/cpp/xml/FunctionExecution/csPartitionRegion.xml
+++ /dev/null
@@ -1,32 +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"/>
-  <pdx read-serialized="true" />
-  <region name="TestTCR1">
-    <region-attributes  data-policy="partition">
-    </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>
-      <class-name>javaobject.RegionOperationsFunctionOptimized</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.RegionOperationsFunctionOptimizedFalse</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/csPartitionRegionForFEHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csPartitionRegionForFEHA.xml b/src/tests/cpp/xml/FunctionExecution/csPartitionRegionForFEHA.xml
deleted file mode 100755
index f1bd69b..0000000
--- a/src/tests/cpp/xml/FunctionExecution/csPartitionRegionForFEHA.xml
+++ /dev/null
@@ -1,17 +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="partition">
-       <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.GetFunctionExeHA</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/csReplicatedPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csReplicatedPR.xml b/src/tests/cpp/xml/FunctionExecution/csReplicatedPR.xml
deleted file mode 100755
index 9039139..0000000
--- a/src/tests/cpp/xml/FunctionExecution/csReplicatedPR.xml
+++ /dev/null
@@ -1,23 +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="partitionedRegion">
-    <region-attributes  data-policy="partition">
-    </region-attributes>
-  </region>
-  <region name="replicatedRegion">
-    <region-attributes  data-policy="replicate">
-    </region-attributes>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.ExceptionHandlingFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.FireNForget</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/csReplicatedRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/csReplicatedRegion.xml b/src/tests/cpp/xml/FunctionExecution/csReplicatedRegion.xml
deleted file mode 100755
index 9dbd07b..0000000
--- a/src/tests/cpp/xml/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/FunctionExecution/exceptionHandling.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/exceptionHandling.xml b/src/tests/cpp/xml/FunctionExecution/exceptionHandling.xml
deleted file mode 100644
index 438e19e..0000000
--- a/src/tests/cpp/xml/FunctionExecution/exceptionHandling.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="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>
-  <data name="isExcpHnd">true</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="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion2</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">partitionedRegion</data>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <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="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteExceptionHandling" action="doExecuteExceptionHandling" container="functionExecution" waitTime="20m" continueOnError="true" parallel="true">
-      <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="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/functionExecutionHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/functionExecutionHA.xml b/src/tests/cpp/xml/FunctionExecution/functionExecutionHA.xml
deleted file mode 100644
index 49d6073..0000000
--- a/src/tests/cpp/xml/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="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion2</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-       <data name="regionName">partitionedRegion</data>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <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="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunctionWithHA" action="doExecuteExceptionHandling" container="functionExecution" waitTime="20m" continueOnError="true" parallel="true">
-      <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="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/nonPRFunctionExecuteTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/nonPRFunctionExecuteTest.xml b/src/tests/cpp/xml/FunctionExecution/nonPRFunctionExecuteTest.xml
deleted file mode 100644
index de66b48..0000000
--- a/src/tests/cpp/xml/FunctionExecution/nonPRFunctionExecuteTest.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-	
-  <data name="distinctKeys">
-    <list>
-      <item>100</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 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="nonPRFunctionExecuteTest" description="Testing function execution APIs">
-    <task name="setupCacheServers 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csReplicatedRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="setupCacheServers 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH FunctionExecution/csEmptyDataPolicy.xml</data>
-      <client-set name="JCS2"/>
-    </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="CreateRegion1" action="doCreateRegion" container="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <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="functionExecution" waitTime="2m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecHAWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecHAWithResult.xml b/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecHAWithResult.xml
deleted file mode 100644
index f6f0d62..0000000
--- a/src/tests/cpp/xml/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="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctionsHA" container="functionExecution" parallel="true" waitTime="25m">
-      <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="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onRegionFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecWithOutResult.xml b/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecWithOutResult.xml
deleted file mode 100644
index a9ab73d..0000000
--- a/src/tests/cpp/xml/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="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <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="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onRegionFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecWithResult.xml b/src/tests/cpp/xml/FunctionExecution/onRegionFunctionExecWithResult.xml
deleted file mode 100644
index 5e01a94..0000000
--- a/src/tests/cpp/xml/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="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <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="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onServerFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onServerFunctionExecWithOutResult.xml b/src/tests/cpp/xml/FunctionExecution/onServerFunctionExecWithOutResult.xml
deleted file mode 100644
index da6ce24..0000000
--- a/src/tests/cpp/xml/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="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <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="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onServerFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onServerFunctionExecWithResult.xml b/src/tests/cpp/xml/FunctionExecution/onServerFunctionExecWithResult.xml
deleted file mode 100644
index dd7c3c3..0000000
--- a/src/tests/cpp/xml/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="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <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="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onServersFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onServersFunctionExecWithOutResult.xml b/src/tests/cpp/xml/FunctionExecution/onServersFunctionExecWithOutResult.xml
deleted file mode 100644
index e07da56..0000000
--- a/src/tests/cpp/xml/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="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution without result -->
-    <task name="create entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction without result" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <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="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/onServersFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/onServersFunctionExecWithResult.xml b/src/tests/cpp/xml/FunctionExecution/onServersFunctionExecWithResult.xml
deleted file mode 100644
index 82842a8..0000000
--- a/src/tests/cpp/xml/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="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <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="functionExecution" waitTime="2m"/>
-    <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/FunctionExecution/replicatedRegionExecution.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/FunctionExecution/replicatedRegionExecution.xml b/src/tests/cpp/xml/FunctionExecution/replicatedRegionExecution.xml
deleted file mode 100644
index e2d8a2d..0000000
--- a/src/tests/cpp/xml/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="functionExecution" waitTime="3m">
-      <data name="regionSpec">ThinClientRegion1</data>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <!-- test function execution with result -->
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Add entry by ExecuteFunction" action="doAddDestroyNewKeysFunction" container="functionExecution" waitTime="15m">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="functionExecution" waitTime="15m">
-      <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="functionExecution" waitTime="2m"/>
-    <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/CqQuery/concCQMTTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/concCQMTTest.xml b/src/tests/cpp/xml/Generics/CqQuery/concCQMTTest.xml
deleted file mode 100644
index 9709ca5..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/concCQMTTest.xml
+++ /dev/null
@@ -1,110 +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>10000</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-   <list>
-     <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-   <list>
-     <item>6</item>
-   </list>
-  </data>
-  <data name="keyType">int</data>
-  <data name="clientCnt">3</data>
-  <data name="serverCount">2</data>
-  <data name="cqtest">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
- <client-set name="JCS1" hostGroup="CS"/>
- <client-set name="JCS2" hostGroup="CS"/>
- <client-set count="3" name="Client"/>
- <client-set name="Feeder"/>
-
- <test name="conCQBridge" description="Test CQ with a variety of operations with careful validation and concurrent execution ,with multiple threads">
-   <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-     <data name="program">setupJavaServers</data>
-     <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH hct/csAckMirror.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="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-     <data name="regionName">TestTCR1</data>
-     <data name="regionSpec">ThinClientRegion</data>
-     <client-set count="3" name="Client"/>
-     <client-set name="Feeder"/>
-   </task>
-   <task name="Register All keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="2m">
-     <client-set count="3" name="Client"/>
-   </task>
-   <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="20m">
-     <client-set name="Feeder"/>
-     <client-set count="1" name="Client"/>
-   </task>
-   <task name="LoadRegion" action="doFeedInt" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="20m">
-     <client-set name="Feeder"/>
-   </task>
-   <task name="Register CQ with executeWithIR " action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-     <data name="query">
-       <list>
-         <item>select * from /TestTCR1</item>
-       </list>
-     </data>
-     <client-set count="3" name="Client"/>
-  </task>
-  <task name="verify queryResults" action="doVerifyQueryResult" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="5m">
-    <data name="query">
-      <list>
-        <item>select * from /TestTCR1</item>
-      </list>
-    </data>
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="DoOperations in concurrent fashion" action="doRROps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="10m">
-    <data name="query">
-      <list>
-        <item>select * from /TestTCR1</item>
-      </list>
-    </data>
-    <client-set count="1" name="Client"/>
-  </task>
-  <task name="validate entry events against the listener count" action="doValidateEvents" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" 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>
- </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/cqDurableQS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/cqDurableQS.xml b/src/tests/cpp/xml/Generics/CqQuery/cqDurableQS.xml
deleted file mode 100644
index de305c2..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/cqDurableQS.xml
+++ /dev/null
@@ -1,176 +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>100</item>
-   </list>
-  </data>
-
-  <data name="valueSizes">
-   <list>
-     <item>100</item>
-   </list>
-  </data>
-
-  <data name="keyType">int</data>
-
- <!--Default Values for this test only-->
- <data name="isDurable">true</data>
- <data name="keepAlive">true</data>
- <data name="durableTimeout">120</data>
- <data name="updateReceiveTime">60</data>
- <data name="registerAndExecuteCQs">true</data>
- <data name="executeWithIR">false</data>
- <data name="cq">true</data>
- <data name="invalidate">true</data>
-
-<data name="ThinClientRegion">
-  <snippet>
-    <region name="dummyRegion">
-      <region-attributes caching-enabled="true" client-notification="true">
-      </region-attributes>
-    </region>
-  </snippet>
-</data>
-<data name="regionSpec">ThinClientRegion</data>
-<client-set name="JCS1" hostGroup="CS"/>
-<client-set name="JCS2" hostGroup="CS"/>
-<client-set name="Feeder"/>
-<client-set name="DClient1"/>
-<client-set name="NDClient1"/>
-
-<test name="CqDurableQS" description="Test for testing Cq and Query Service for durable and non durable clients,along with event based validation .">
-  <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-    <data name="program">setupJavaServers</data>
-    <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-    <client-set name="JCS1"/>
-  </task>
-<task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-  <data name="program">startJavaServers</data>
-  <data name="arguments">1</data>
-  <client-set name="JCS1"/>
-</task>
-<task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-  <data name="program">startJavaServers</data>
-  <data name="arguments">2</data>
-  <client-set name="JCS2"/>
-</task>
-<task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <data name="regionName">dummyRegion</data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <client-set name="DClient1"/>
-</task>
-<task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <data name="regionName">dummyRegion</data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="isDurable">false</data>
-  <client-set name="NDClient1"/>
-</task>
-<task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <data name="regionName">dummyRegion</data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <client-set name="Feeder"/>
-</task>
-<task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="DClient1"/>
-  <data name="isDurableReg">true</data>
-</task>
-<task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="NDClient1"/>
-</task>
-<task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="DClient1"/>
-  <data name="isDurableC">true</data>
-  <data name="query">
-    <list>
-      <item>select * from /dummyRegion</item>
-    </list>
-   </data>
-</task>
-<task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="NDClient1"/>
-  <data name="isDurableC">false</data>
-  <data name="query">
-    <list>
-      <item>select * from /dummyRegion</item>
-    </list>
-  </data>
-</task>
-<!--task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <data name="cqState">stopped</data>
-  <client-set name="NDClient1"/>
-  <client-set  name="DClient1"/>
-</task>
-<task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,Portfolio" waitTime="15m" parallel="true">
-  <data name="entryOps">
-    <oneof>
-      <item>add</item>
-      <item>add</item>
-    </oneof>
-  </data>
-  <data name="workTime">2m</data>
-  <data name="opsSecond">5</data>
-  <data name="entryCount">100</data>
-  <data name="valueSizes">100</data>
-  <data name="regionName">dummyRegion</data>
-  <data name="objectType">Portfolio</data>
-  <client-set name="Feeder"/>
-</task>
-<task name="Validate CQs for DC" action="doValidateCq" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="DClient1"/>
-  <data name="isDurableC">true</data>
-</task>
-<task name="Validate CQs for NDC" action="doValidateCq" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set name="NDClient1"/>
-  <data name="isDurableC">false</data>
-</task>
-<task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <client-set  name="DClient1"/>
-  <client-set name="NDClient1"/>
-  <data name="checkEvents">true</data>
-  <data name="stopped">true</data>
-</task>
-<task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
-  <data name="cqState">execute</data>
-  <client-set name="NDClient1"/>
-  <client-set  name="DClient1"/>
-</task-->
-<task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,Portfolio" waitTime="15m" parallel="true">
-  <data name="entryOps">
-    <oneof>
-      <item>add</item>
-       <item>invalidate</item>
-      <item>add</item>
-    </oneof>
-  </data>
-  <data name="workTime">3m</data>
-  <data name="opsSecond">5</data>
-  <data name="entryCount">100</data>
-  <data name="valueSizes">100</data>
-  <data name="regionName">dummyRegion</data>
-  <data name="objectType">Portfolio</data>
-  <client-set name="Feeder"/>
-</task>
-<task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m">
- <client-set  name="DClient1"/>
- <client-set name="NDClient1"/>
- <data name="checkEvents">true</data>
- <data name="execute">true</data>
-</task>
-<task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="String,Portfolio" waitTime="5m"/>
-<task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-  <data name="program">stopJavaServers</data>
-  <data name="arguments">1</data>
-  <client-set name="JCS1"/>
-</task>
-<task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-  <data name="program">stopJavaServers</data>
-  <data name="arguments">2</data>
-  <client-set name="JCS2"/>
-</task>
-</test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/csAckMirror.xml b/src/tests/cpp/xml/Generics/CqQuery/csAckMirror.xml
deleted file mode 100644
index cecbdcb..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/csAckMirror.xml
+++ /dev/null
@@ -1,14 +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="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/durableCqFailoverR2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/durableCqFailoverR2.xml b/src/tests/cpp/xml/Generics/CqQuery/durableCqFailoverR2.xml
deleted file mode 100644
index 3651b00..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/durableCqFailoverR2.xml
+++ /dev/null
@@ -1,208 +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">
-
-<!-- Description 
-# Servers  1
-# Clients  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 2.  All Clients Close n Restart after timeout in cylcles. All Clients should miss few events.
--->
-  <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="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="keyType">str</data>
-
-  <!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="keepAlive">true</data>
-  <data name="durableTimeout">120</data>
-  <data name="restartTime">0</data>
-  <data name="updateReceiveTime">60</data>
-  <data name="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableCqFailoverR2" description="Basic test for durable client failover with cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="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="StartCacheServer 4" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio" >
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="25m" timesToRun="15" parallel="true" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" 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="30m" 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="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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="JCS2"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-</test-driver>


Mime
View raw message