http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialEntryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialEntryEvent.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialEntryEvent.xml
deleted file mode 100644
index 3feb7e7..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialEntryEvent.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>1000</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="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 
Generics/parReg/pdx/CqQuery/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="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>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>50</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="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>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-          <item>45</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>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>50</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/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
 
b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
deleted file mode 100644
index 604475f..0000000
--- 
a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
+++ /dev/null
@@ -1,233 +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="keyType">int</data-->
-  <data name="cq">true</data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</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 name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialMultRegOpsCQListenerWithFeeder" description="cq with 
multiregion test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 
Generics/parReg/pdx/CqQuery/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="CreateClients" action="doAddRootAndSubRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PortfolioPdx">
-      <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 /Portfolios2</item>
-           <item>select * from /Portfolios3</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="PopulateRegion" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</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="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>1000</item>
-          <item>1000</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="destroyKeys" action="doDestroyUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">100</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="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-          <item>1000</item>
-          <item>900</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="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="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>1000</item>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" 
argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" 
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">1m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">PortfolioPdx</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,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="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/CqQuery/serverFailoverAndCQOps.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serverFailoverAndCQOps.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serverFailoverAndCQOps.xml
deleted file mode 100644
index 4124350..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/serverFailoverAndCQOps.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="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="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 
Generics/parReg/pdx/CqQuery/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/CqQuery/singleRegCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/singleRegCQOps.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/singleRegCQOps.xml
deleted file mode 100644
index c5e2578..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/CqQuery/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="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 
Generics/parReg/pdx/CqQuery/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/pdx/Pdx/concAutoSerializer.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/concAutoSerializer.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/concAutoSerializer.xml
deleted file mode 100644
index 9d1706e..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/concAutoSerializer.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="objectType">AutoSerilizer</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" 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="pdxtests" 
function="createSilenceListenerPdx"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" 
function="createSilenceListenerPdx"/>
-        </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 count="4" name="Client"/>
-
-  <test name="concAutoSerializer" 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 VMs. The test uses serial round robin; the first client
-in the round does a random operation then all other clients in the round
-verify their view of the operation.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 
Generics/parReg/pdx/Pdx/csPartitionRegion.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="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" 
argTypes="String,Object"  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.pdxtests" 
argTypes="String,Object"  waitTime="5m">
-      <client-set begin="1" count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" 
argTypes="String,Object"  waitTime="5m">
-      <client-set begin="4" count="1" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" 
argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Create Operations" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" 
argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" 
parallel="true" argTypes="String,Object">
-      <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>
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="DumpDataOnBB" action="dumpDataOnBB" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" 
argTypes="String,Object">
-      <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.pdxtests" waitTime="2m" 
argTypes="String,Object">
-      <client-set begin="1" count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <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>
-
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPRPdxFERegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPRPdxFERegion.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPRPdxFERegion.xml
deleted file mode 100644
index 911e800..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPRPdxFERegion.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://geode.apache.org/schema/cache 
http://geode.apache.org/schema/cache/cache-1.0.xsd";
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <pdx read-serialized="true" />
-  <region name="TestTCR1">
-    <region-attributes data-policy="partition"/>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.RegionOperationsFunctionPdx</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPartitionRegion.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPartitionRegion.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPartitionRegion.xml
deleted file mode 100755
index a087a58..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPartitionRegion.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/pdx/Pdx/csPdxInstance.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPdxInstance.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPdxInstance.xml
deleted file mode 100644
index 584dd54..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPdxInstance.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://geode.apache.org/schema/cache 
http://geode.apache.org/schema/cache/cache-1.0.xsd";
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <pdx read-serialized="true" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <!--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/pdx/Pdx/csPersistentRgn.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPersistentRgn.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPersistentRgn.xml
deleted file mode 100755
index ab9aeb1..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csPersistentRgn.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-  <cache-server port="$PORT_NUM"/>
-  <pdx persistent="true" read-serialized="true"/>
-
-  <!-- define a region to hold portfolio objects -->
-  <region name="TestTCR1">
-    <region-attributes data-policy="persistent-replicate"/>
-  </region>
-  <function-service>
-  <function>
-    <class-name>javaobject.RegionOperationsFunctionPdx</class-name>
-  </function>
-</function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csReplicatedPdxRegion.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csReplicatedPdxRegion.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csReplicatedPdxRegion.xml
deleted file mode 100644
index f490ce4..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/csReplicatedPdxRegion.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://geode.apache.org/schema/cache 
http://geode.apache.org/schema/cache/cache-1.0.xsd";
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <pdx read-serialized="true" />
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-  <function-service>
-    <function>
-      <class-name>javaobject.RegionOperationsFunctionPdx</class-name>
-    </function>
-  </function-service>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxFailover.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxFailover.xml
deleted file mode 100644
index 9ef7df6..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxFailover.xml
+++ /dev/null
@@ -1,170 +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="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="minServers">2</data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="objectType">PdxVersioned</data>
-  <data name="versionNum">1</data>
-  
-
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" load-conditioning-interval="5000" 
servers="true" />
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" 
function="createSilenceListenerPdx"/>
-        </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"/>
-
-  <test name="pdxFailover" description="This test executes operations on 
entries on a PartitionedRegion and carefully
-validates for correctness. In the test clients do random operation where at 
same time timily stop start server are triggered.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/tx/csPRRedundency1.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="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" 
argTypes="String,Object"  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.pdxtests" 
argTypes="String,Object"  waitTime="5m">
-      <client-set count="4" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" 
argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task>
-    <task name="Create Operations" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" 
argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doRandomEntryOperation" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" 
parallel="true" argTypes="String,Object">
-      <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>
-      <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="DumpDataOnBB" action="dumpDataOnBB" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="5m" 
argTypes="String,Object">
-    <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.pdxtests" waitTime="2m" 
argTypes="String,Object">
-    <client-set count="4" name="Client"/>
-  </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxInstanceFactoryTest.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxInstanceFactoryTest.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxInstanceFactoryTest.xml
deleted file mode 100644
index 5285a09..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxInstanceFactoryTest.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="PdxReadSerialized">true</data>
-  <data name="clientCount">2</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="objectType">PdxInstanceFactory</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" 
thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="0" 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="pdxtests" 
function="createSilenceListenerPdx"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="EmptyClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-          <cache-listener library="pdxtests" 
function="createSilenceListenerPdx"/>
-        </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 count="2" name="Client"/>
-
-  <test name="pdxInstanceFactoryTest" 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 VMs. The test uses serial round robin; the first client
-in the round does a random operation then all other clients in the round
-verify their view of the operation.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" 
waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 
Generics/parReg/pdx/Pdx/csPdxInstance.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="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" 
argTypes="String,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" 
argTypes="String,Object"  waitTime="5m">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" 
argTypes="String,Object"  waitTime="5m">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
-    </task>
-    <!--task name="Register All Keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="2m" 
argTypes="String,Object">
-      <client-set count="4" name="Client"/>
-    </task-->
-    <task name="Create Operations" action="doPopulateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" 
argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" 
argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-    <task name="ValidatePdxInstance" action="doVerifyAndModifyPdxInstance" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" 
argTypes="String,Object">
-      <client-set  begin="2" count="1" name="Client"/>
-    </task>
-    <task name="Random Operations" action="doPuts" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" 
argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="1" name="Client"/>
-    </task>
-     <task name="ValidatePdxInstance" action="doVerifyAndModifyPdxInstance" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" 
argTypes="String,Object">
-      <client-set  begin="1" count="1" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" 
argTypes="String,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" 
waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <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>
-
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionFE.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionFE.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionFE.xml
deleted file mode 100644
index b4370e0..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionFE.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">1000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="objectType">PdxVersioned</data>
-  <data name="isSkipOps">true</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 pool-name="_Test_Pool1" scope="distributed-ack" 
caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" pool-name="_Test_Pool1" 
caching-enabled="true" client-notification="true" 
concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" 
function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-
-  <data name="isPdxObject">true</data>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-  <data name="funcName">RegionOperationsFunctionPdx</data>    
-
-  <test name="pdxPRRegionFE" description="This test creates a PR region , then 
does various entry operations(using function execution)
- on a known key range. Values are checked for correctness in the close task.
- This test is with client server configuration.">
-    <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/Pdx/csPRPdxFERegion.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="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests"  waitTime="3m" 
argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" 
argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-     <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" 
argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-     <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" 
argTypes="int,object">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="versionNum">1</data>
-      <client-set begin="3" count="1" name="Client"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="int,object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Register All keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" 
argTypes="int,object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="LoadRegion" action="doFeedInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="DoGetServerKeys" action="doGetServerKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" 
waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-    <task name="DoOperations" action="doOps" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" 
waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" 
argTypes="int,object">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="VerifYRegionContents after doOps by FE" 
action="doVerifyRegionContentsAfterLateOps" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="DoGetServerKeys" action="doGetServerKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" 
waitTime="10m" argTypes="int,object">
-      <client-set begin="3" count="1" 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>
-    
-    
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionOps.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionOps.xml
deleted file mode 100644
index fb1765f..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPRRegionOps.xml
+++ /dev/null
@@ -1,113 +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>1</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">1000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="objectType">PdxVersioned</data>
-  <data name="isSkipOps">true</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 pool-name="_Test_Pool1" scope="distributed-ack" 
caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" pool-name="_Test_Pool1" 
caching-enabled="true" client-notification="true" 
concurrency-checks-enabled="true">
-          <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="2" name="Client"/>
-<data name="funcName">RegionOperationsFunctionPdx</data>    
-  <test name="pdxPRRegionOps" description="This test creates a PR region , 
then does various entry operations(using function execution)
- on a known key range. Values are checked for correctness in the close task.
- This test is with client server configuration.">
-    <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/pdx/Pdx/csPRPdxFERegion.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="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests"  waitTime="3m" 
argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="2" name="Client"/>
-    </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.pdxtests" waitTime="10m" 
argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-     <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" 
argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-    <task name="InitInstance" action="doInitInstance" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="int,object">
-       <client-set count="2" name="Client"/>
-    </task>
-    <task name="Register All keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" 
argTypes="int,object">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="LoadRegion" action="doFeedInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="DoOperations" action="doOps" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="Wait for updates" action="doWaitForSilenceListenerComplete" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" 
argTypes="int,object">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="VerifYRegionContents after doOps" 
action="doVerifyRegionContentsAfterLateOps" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-    <task name="DoGetServerKeys" action="doGetServerKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" 
waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </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>
-     
-    
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPersistentRegionFE.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPersistentRegionFE.xml 
b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPersistentRegionFE.xml
deleted file mode 100644
index c1665a7..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPersistentRegionFE.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="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">1000</data>
-  <data name="NumNewKeys">200</data>
-  <data name="objectType">PdxVersioned</data>
-  <data name="isSkipOps">true</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 pool-name="_Test_Pool1" scope="distributed-ack" 
caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" pool-name="_Test_Pool1" 
caching-enabled="true" client-notification="true" 
concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" 
function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <data name="isPdxObject">true</data>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-  <data name="funcName">RegionOperationsFunctionPdx</data>   
-
-  <test name="pdxPersistentRegionFE" description="This test creates a PR 
region , then does various entry operations(using function execution)
- on a known key range. Values are checked for correctness in the close task.
- This test is with client server configuration.">
-    <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/Pdx/csPersistentRgn.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="CreatePool" action="doCreatePool" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests"  waitTime="3m" 
argTypes="int,object">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" 
argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-     <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" 
argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-     <task name="CreateClients" action="doCreateRegion" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="10m" 
argTypes="int,object">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="3" count="1" name="Client"/>
-    </task>
-    <task name="InitInstance" action="doInitInstance" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="int,object">
-       <client-set count="2" name="Client"/>
-    </task>
-    <task name="Register All keys" action="doRegisterAllKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2m" 
argTypes="int,object">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="LoadRegion" action="doFeedInt" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="20m" 
argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="DoGetServerKeys" action="doGetServerKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" 
waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-    <task name="DoOperations" action="doOps" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" 
waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task>
-     <task name="Wait for updates" action="doWaitForSilenceListenerComplete" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" 
argTypes="int,object">
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="VerifYRegionContents after doOps by FE" 
action="doVerifyRegionContentsAfterLateOps" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" 
argTypes="int,object">
-      <client-set begin="1" count="1" name="Client"/>
-      <data name="versionNum">1</data>
-    </task>
-    <task name="DoGetServerKeys" action="doGetServerKeys" 
container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" 
waitTime="10m" argTypes="int,object">
-      <client-set begin="3" count="1" 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>
-    
-    
-  </test>
-</test-driver>

Reply via email to