http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/distributedDataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/distributedDataValidationQueryTest.xml
 
b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/distributedDataValidationQueryTest.xml
deleted file mode 100644
index 3f6277d..0000000
--- 
a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/distributedDataValidationQueryTest.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, 
functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, 
unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-    </list>
-  </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>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="client1"/>
-  <client-set name="client2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 
Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" 
waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" 
waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="client1"/>
-      <client-set name="client2"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" 
action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="client1"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" 
action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="client1"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" 
action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="client1"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="client1"/>
-      <client-set name="client2"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" 
action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" 
argTypes="String,PositionPdx">
-      <data name="regionName">Positions</data>
-      <client-set name="client1"/>
-      <data name="objectType">PositionPdx</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" 
waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" 
waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="Running Param Query for Result set" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" 
waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" 
waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set name="client2"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers CS1" action="doRunProcess" container="utils" 
waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers CS2" action="doRunProcess" container="utils" 
waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/entryOperationQueryTest.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/entryOperationQueryTest.xml
 
b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/entryOperationQueryTest.xml
deleted file mode 100644
index 6661fba..0000000
--- 
a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/entryOperationQueryTest.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="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </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 count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 
Generics/parReg/pdx/RemoteQueryPR/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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" 
argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>10000</item>
-          <item>500</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" 
argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>9500</item>
-          <item>475</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx"/>
-    <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/pdx/RemoteQueryPR/failoverQueryTest.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/failoverQueryTest.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/failoverQueryTest.xml
deleted file mode 100644
index 27473a3..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/failoverQueryTest.xml
+++ /dev/null
@@ -1,221 +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">4</data>
-       
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-       
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>13</item>
-      <item>14</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="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" 
function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="Feeder"/>
-  <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="10" name="ThinClient"/>
-
-  <test name="QueryFailoverTest" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data 
name="arguments">Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 7 
Generics/RemoteQueryPR/csWithOutIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" 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="10m" 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="10m" 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="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServer 5" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StartCacheServer 7" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">7</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doAddRootAndSubRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="3m" 
argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="10" name="ThinClient"/>
-      <data name="sleepTime">3</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="20" 
waitTime="1h" continueOnError="true" parallel="true" 
argTypes="String,PortfolioPdx">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="20" 
waitTime="1h" continueOnError="true" parallel="true" 
argTypes="String,PortfolioPdx">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-     <task name="Running Param Query for Result set" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" 
waitTime="60m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" 
waitTime="60m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="60m" 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="60m" 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="60m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="stopStartCacheServer 5" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="60m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="stopStartCacheServer 6" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="60m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="stopStartCacheServer 7" action="doStopStartServer" 
container="utils" timesToRun="2" waitTime="60m" continueOnError="true" 
parallel="true">
-      <data name="ServerId">7</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" 
waitTime="10m" 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="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StopCacheServer 7" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">7</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/regexAndQueryTest.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/regexAndQueryTest.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/regexAndQueryTest.xml
deleted file mode 100644
index 8523477..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/regexAndQueryTest.xml
+++ /dev/null
@@ -1,127 +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>1000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="ThinClient1"/>
-  <client-set name="ThinClient2"/>
-
-  <test name="ThinClientRegexNQuery" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 
Generics/parReg/pdx/RemoteQueryPR/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Populate Entries in ThinClient1" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Gets" action="doGetObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" 
argTypes="String,PortfolioPdx">
-      <data name="registerRegex">port.*</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="ThinClient2"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Update Entries from ThinClient1" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="45m" 
parallel="true" argTypes="String,PortfolioPdx">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-          <item>500</item>
-          <item>1000</item>
-          <item>10000</item>
-        </list>
-      </data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" 
waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" 
waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/serverEvictionQueryTest.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/serverEvictionQueryTest.xml
 
b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/serverEvictionQueryTest.xml
deleted file mode 100644
index 55548a5..0000000
--- 
a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/serverEvictionQueryTest.xml
+++ /dev/null
@@ -1,96 +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="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </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>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 
Generics/parReg/pdx/RemoteQueryPR/csServerEviction.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,PortfolioPdx"> 
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for result set test" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" 
argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx"/>
-    <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/pdx/tx/serialEntryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEvent.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEvent.xml
deleted file mode 100644
index 9ef48c8..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/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/parReg/pdx/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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="UpdateRegion" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" 
argTypes="String,PortfolioPdx">
-      <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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</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,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="verify CQ listener is called" 
action="doVerifyCQListenerInvoked" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <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,PortfolioPdx"/>
-    <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/pdx/tx/serialEntryEventPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEventPR.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/tx/serialEntryEventPR.xml
deleted file mode 100644
index 062ee42..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/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/parReg/pdx/RemoteQuery/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="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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="UpdateRegion" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" 
argTypes="String,PortfolioPdx">
-      <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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</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,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="verify CQ listener is called" 
action="doVerifyCQListenerInvoked" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <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,PortfolioPdx"/>
-    <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/pdx/tx/serverFailoverAndCQOps.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/tx/serverFailoverAndCQOps.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/tx/serverFailoverAndCQOps.xml
deleted file mode 100644
index d850a02..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/tx/serverFailoverAndCQOps.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="useTransactions">true</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="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </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 name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serverFailoverAndCQOps" description="failover test with single 
region">
-    <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/parReg/pdx/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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" 
parallel="true" argTypes="String,PortfolioPdx">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">7m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" 
parallel="true" argTypes="String,PortfolioPdx">
-      <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">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </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="verify CQ listener is called" 
action="doVerifyCQListenerInvoked" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx">
-      <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,PortfolioPdx"/>
-    <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/pdx/tx/singleRegCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/tx/singleRegCQOps.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/tx/singleRegCQOps.xml
deleted file mode 100644
index cd01320..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/tx/singleRegCQOps.xml
+++ /dev/null
@@ -1,120 +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="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 name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="singleRegCQOps" description="single region cq operations test">
-    <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/parReg/pdx/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,PortfolioPdx">
-      <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,PortfolioPdx">
-      <client-set name="ThinClient"/>
-      <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,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" 
parallel="true" argTypes="String,PortfolioPdx">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" 
parallel="true" argTypes="String,PortfolioPdx">
-      <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">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" 
argTypes="String,PortfolioPdx"/>
-    <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/subscription/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/subscription/csAckMirror.xml 
b/src/tests/cpp/xml/Generics/parReg/subscription/csAckMirror.xml
deleted file mode 100644
index a538dae..0000000
--- a/src/tests/cpp/xml/Generics/parReg/subscription/csAckMirror.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" 
concurrency-checks-enabled="true">
-         <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/subscription/csPRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/subscription/csPRegion.xml 
b/src/tests/cpp/xml/Generics/parReg/subscription/csPRegion.xml
deleted file mode 100644
index a087a58..0000000
--- a/src/tests/cpp/xml/Generics/parReg/subscription/csPRegion.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="0"/>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeys.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeys.xml
 
b/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeys.xml
deleted file mode 100644
index 4c0f8aa..0000000
--- 
a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeys.xml
+++ /dev/null
@@ -1,132 +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="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" 
servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" 
client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <!--region-attributes caching-enabled="true" 
client-notification="true" concurrency-checks-enabled="false"-->
-        <region-attributes caching-enabled="true" client-notification="true" 
concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" 
function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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="10" name="Client"/>
-
-  <test name="staticInterestPolicyAllKeys" description="In a client VM/bridge 
server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with ALL_KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 
Generics/parReg/subscription/csPRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" 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="10m" 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="10m" 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="10m" parallel="true">
-      <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.cacheserver"  waitTime="3m" 
argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" 
container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="int,object">
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="LoadRegion     " action="doFeedInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="DoOperations" action="doOps" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" 
argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" 
argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOpsRI" 
action="doVerifyRegionContentsAfterOpsRI" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-   <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="int,object"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" 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="10m" 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="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" 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/subscription/staticInterestPolicyAllKeysLateOps.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeysLateOps.xml
 
b/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeysLateOps.xml
deleted file mode 100644
index 3206770..0000000
--- 
a/src/tests/cpp/xml/Generics/parReg/subscription/staticInterestPolicyAllKeysLateOps.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="false" min-connections="2" read-timeout="60000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" 
servers="true" />
-    </snippet>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" 
client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true" 
concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" 
function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <client-set name="Feeder"/>
-  <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="10" name="Client"/>
-
-  <test name="staticInterestPolicyAllKeysLateOps" description="In a client 
VM/bridge server configuration one client VM loads data into the
-region which distributes it to all bridge servers. Each remaining client 
-VM then calls registerInterest either with interest policy 
-with ALL_KEYS as the keys of interest. Then the same VM that did the
-load does operations on the region (destroy invalidate etc). Each remaining 
-client then validates that the proper keys and/or values are present in the 
-client region.">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 
Generics/parReg/subscription/csPRegion.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" 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="10m" 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="10m" 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="10m" parallel="true">
-      <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.cacheserver"  waitTime="3m" 
argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <!--task name="Create Feeder Client" action="doCreateRegion" 
container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task-->
-    <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="int,object">
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="LoadRegion     " action="doFeedInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" 
argTypes="int,object">
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsBeforeOps" 
action="doVerifyRegionContentsBeforeOps" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-      <task name="DoOperations" action="doOps" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="VerifyRegionContentsAfterOps" 
action="doVerifyRegionContentsAfterLateOps" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-       <client-set count="10" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" 
argTypes="int,object"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" 
waitTime="10m" 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="10m" 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="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" 
waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-  </test>
-</test-driver>

Reply via email to