geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [22/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:01 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency3.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency3.xml b/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency3.xml
deleted file mode 100644
index 404addb..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/conParRegBridgeRedundency3.xml
+++ /dev/null
@@ -1,216 +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>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</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>
-      <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>
-  <data name="clientCount">4</data>
-  <data name="useTransactions">true</data>
-  <data name="numPutAllExistingKeys">0</data>
-  <data name="numPutAllNewKeys">1</data>
- 
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="3" load-conditioning-interval="5000" servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-                                 
-  <data name="minServers">3</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 name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-
-  <test name="conParRegBridge" description="This test executes operations on entries on a PartitionedRegion and carefully
-validates for correctness. The data store for the partitioned region is spread
-across all bridge servers">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 Generics/parReg/tx/csPRRedundency3.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="StartCacheServers" 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="StartCacheServers" 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="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-     <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="1" count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="String,String"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-          <item>putAll</item>          
-         </oneof>
-      </data>
-      <data name="workTime">200</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="4" name="Client"/>
-    </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 1" 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 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-     <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="expectedKeys">100</data>
-    </task>
-    <task name="ValidateData" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" argTypes="String,String">
-      <client-set begin="1" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="String,String"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    
-    
-
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/concDeltaPRBridge.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/concDeltaPRBridge.xml b/src/tests/cpp/xml/Generics/parReg/tx/concDeltaPRBridge.xml
deleted file mode 100644
index 0a19b45..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/concDeltaPRBridge.xml
+++ /dev/null
@@ -1,123 +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">5m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-<data name="useTransactions">true</data>
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" pr-single-hop-enabled="false" subscription-enabled="true" locators="true" ping-interval="100" read-timeout="60000" subscription-redundancy="1" />
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-          <cache-listener library="deltatest" function="createDeltaValidationCacheListener"/>
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
- 
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="4" name="Client"/>
-  <client-set name="Feeder"/>
-
-  <test name="deltaPropogationPRTest" description="Test delta propagation in a concurrent test with validation in a bridge configuration with PR regions">
-    <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 Delta/csDeltaPR.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="5m" argTypes="String,DeltaTestImpl">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="4" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="5m" argTypes="String,DeltaTestImpl">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="5m" argTypes="String,DeltaTestImpl">
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="2m" argTypes="String,DeltaTestImpl">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="10m" argTypes="String,DeltaTestImpl">
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="do random entry ops " action="doEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="15m" parallel="true" argTypes="String,DeltaTestImpl">
-      <data name="entryOps">
-        <oneof>
-          <item>put</item>
-          <item>put</item>
-          <!--item>destroy</item-->
-          <item>put</item>
-        </oneof>
-      </data>
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="validate test" action="doValidateDeltaTest" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="5m" argTypes="String,DeltaTestImpl">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="5m" argTypes="String,DeltaTestImpl"/>
-    <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/parReg/tx/concDeltaReplicateBridge.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/concDeltaReplicateBridge.xml b/src/tests/cpp/xml/Generics/parReg/tx/concDeltaReplicateBridge.xml
deleted file mode 100644
index e359aa6..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/concDeltaReplicateBridge.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">10m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-<data name="useTransactions">true</data>
-  <data name="keyType">str</data>
-  
- <data name="ThinClientPool">
-   <snippet>
-     <pool name="_Test_Pool1" pr-single-hop-enabled="false" subscription-enabled="true" locators="true" ping-interval="100" read-timeout="60000" subscription-redundancy="3" />
-   </snippet>
- </data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-        </region-attributes>  
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-        <cache-listener library="deltatest" function="createDeltaValidationCacheListener"/>
-        <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>  
-      </region>
-    </snippet>
-  </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="4" name="Client"/>
-  <client-set name="Feeder"/>
-
-  <test name="deltaPropogationNoConflationTest" description="Test delta propagation in a concurrent test with validation in a bridge configuration with replicate region">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -c 4 Delta/csDeltaNoConflate.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers4" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="5m" argTypes="String,DeltaTestImpl">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set  count="4"  name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-     <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="5m" argTypes="String,DeltaTestImpl">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="5m" argTypes="String,DeltaTestImpl">
-      <client-set name="Feeder"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="2m" argTypes="String,DeltaTestImpl">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Populating Entries in Region" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="10m" argTypes="String,DeltaTestImpl">
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="do random entry ops " action="doEntryOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="30m" parallel="true" argTypes="String,DeltaTestImpl">
-      <data name="entryOps">
-        <oneof>
-          <item>put</item>
-          <item>put</item>
-          <!--item>destroy</item-->
-          <item>put</item>
-        </oneof>
-      </data>
-      <data name="regionName">TestTCR1</data>
-      <data name="opsSecond">5</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set count="4" name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="validate test" action="doValidateDeltaTest" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="5m" argTypes="String,DeltaTestImpl">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.deltatest" waitTime="5m" argTypes="String,DeltaTestImpl"/>
-    <task name="StopCacheServers1" 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="StopCacheServers2" 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="StopCacheServers3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers4" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
- </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csAckMirror.xml b/src/tests/cpp/xml/Generics/parReg/tx/csAckMirror.xml
deleted file mode 100644
index a1fd1be..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csAckMirror.xml
+++ /dev/null
@@ -1,10 +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 scope="distributed-ack" data-policy="replicate" concurrency-checks-enabled="true"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPR.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPR.xml
deleted file mode 100644
index 7e17a02..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPR.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 data-policy="partition">
-      <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/parReg/tx/csPRRedundency1.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency1.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency1.xml
deleted file mode 100644
index bb88e0c..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency1.xml
+++ /dev/null
@@ -1,12 +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="1"/>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency2.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency2.xml
deleted file mode 100644
index d28c339..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency2.xml
+++ /dev/null
@@ -1,12 +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>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency3.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency3.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency3.xml
deleted file mode 100644
index ca5c56b..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPRRedundency3.xml
+++ /dev/null
@@ -1,12 +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="3"/>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegion.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegion.xml
deleted file mode 100644
index f81abd4..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegion.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-  <pdx read-serialized="false" ignore-unread-fields="false" persistent="false"/>
-  <region name="TestTCR1">
-    <region-attributes multicast-enabled="false" enable-async-conflation="false" enable-subscription-conflation="false" enable-gateway="false" data-policy="partition" initial-capacity="16" load-factor="0.75" concurrency-level="16" concurrency-checks-enabled="true" statistics-enabled="false" ignore-jta="false" is-lock-grantor="false" disk-synchronous="true" cloning-enabled="false">
-      <region-time-to-live>
-        <expiration-attributes timeout="0" action="invalidate"/>
-      </region-time-to-live>
-      <region-idle-time>
-        <expiration-attributes timeout="0" action="invalidate"/>
-      </region-idle-time>
-      <entry-time-to-live>
-        <expiration-attributes timeout="0" action="invalidate"/>
-      </entry-time-to-live>
-      <entry-idle-time>
-        <expiration-attributes timeout="0" action="invalidate"/>
-      </entry-idle-time>
-      <partition-attributes redundant-copies="0" local-max-memory="216" total-max-memory="2147483647" total-num-buckets="113" recovery-delay="-1" startup-recovery-delay="0"/>
-      <subscription-attributes interest-policy="cache-content"/>
-      <cache-listener>
-        <class-name>javaobject.BridgeEventListener</class-name>
-      </cache-listener>
-    </region-attributes>
-  </region>
-  <function-service/>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegionColo.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegionColo.xml b/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegionColo.xml
deleted file mode 100644
index 8aba2a2..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csPartitionRegionColo.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"/>
-  <region name="TestTCR1">
-    <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-  <region name="TestTCR1_1">
-    <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="0" colocated-with="TestTCR1"/>
-    </region-attributes>
-  </region>
-  <region name="TestTCR1_2">
-    <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="0" colocated-with="TestTCR1_1"/>
-    </region-attributes>
-  </region>
-  <region name="TestTCR1_3">
-    <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="0" colocated-with="TestTCR1_2"/>
-    </region-attributes>
-  </region>
-  <region name="TestTCR1_4">
-    <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="0" colocated-with="TestTCR1_3"/>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/csReplicateRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/csReplicateRegion.xml b/src/tests/cpp/xml/Generics/parReg/tx/csReplicateRegion.xml
deleted file mode 100644
index ed5f268..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/csReplicateRegion.xml
+++ /dev/null
@@ -1,12 +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">
-      <!-- partition-attributes redundant-copies="0"/-->
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/tx/functionExecutionHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/functionExecutionHA.xml b/src/tests/cpp/xml/Generics/parReg/tx/functionExecutionHA.xml
deleted file mode 100644
index f553175..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/functionExecutionHA.xml
+++ /dev/null
@@ -1,121 +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>
-  <data name="useTransactions">true</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>
-        </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/parReg/tx/onRegionFunctionExecWithOutResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/onRegionFunctionExecWithOutResult.xml b/src/tests/cpp/xml/Generics/parReg/tx/onRegionFunctionExecWithOutResult.xml
deleted file mode 100644
index fa0106d..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/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>
-  <data name="useTransactions">true</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/parReg/tx/onRegionFunctionExecWithResult.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/onRegionFunctionExecWithResult.xml b/src/tests/cpp/xml/Generics/parReg/tx/onRegionFunctionExecWithResult.xml
deleted file mode 100644
index 5758be1..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/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>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>
-  <data name="useTransactions">true</data>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="5" 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="5" 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="5" name="Client"/>
-    </task>
-    <task name="PopulateRegion" action="doLoadRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="5" 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="5" 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="5" name="Client"/>
-    </task>
-    <task name="ExecuteFunction" action="doExecuteFunctions" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="15m" argTypes="String,String">
-      <client-set count="5" name="Client"/>
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-          <item>destroy</item>
-          <item>get</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="workTime">2m</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/parReg/tx/replicatedRegionExecution.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/replicatedRegionExecution.xml b/src/tests/cpp/xml/Generics/parReg/tx/replicatedRegionExecution.xml
deleted file mode 100644
index d14ee08..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/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>
-  <data name="useTransactions">true</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/parReg/tx/serialEntryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEvent.xml b/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEvent.xml
deleted file mode 100644
index 8bec516..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEvent.xml
+++ /dev/null
@@ -1,209 +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="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="useTransactions">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="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEvent" description="doing operations serially">
-    <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 Generics/RemoteQuery/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="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="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="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</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="UpdateRegion" 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="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" 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>
-      <data name="destroyKeys">20</data>
-    </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 name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>80</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="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </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 name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" 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>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </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 name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </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="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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/parReg/tx/serialEntryEventPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPR.xml b/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPR.xml
deleted file mode 100644
index c6bb8b5..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPR.xml
+++ /dev/null
@@ -1,209 +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="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="useTransactions">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="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEvent" description="doing operations serially">
-    <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 Generics/RemoteQuery/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="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="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="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</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="UpdateRegion" 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="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-          </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" 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>
-      <data name="destroyKeys">20</data>
-    </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 name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>80</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="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </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 name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" 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>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </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 name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </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="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <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/parReg/tx/serialEntryEventPRWithRegInterest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPRWithRegInterest.xml b/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPRWithRegInterest.xml
deleted file mode 100644
index c8518b8..0000000
--- a/src/tests/cpp/xml/Generics/parReg/tx/serialEntryEventPRWithRegInterest.xml
+++ /dev/null
@@ -1,216 +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="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</data>
-  <!--data name="keyType">int</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 count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEventWithRegInterest" description="cq test with register interest">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/tx/csPR.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="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Register And execute CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="registerAndExecuteCQs">true</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="UpdateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroysKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys">
-      <list>
-        <item>20</item>
-      </list>
-  </data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>80</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,byte[]">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>100</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroysKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="destroy region" action="doDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ removed " action="doVerifyCqDestroyed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 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>
-  </test>
-
-</test-driver>


Mime
View raw message