geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [26/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:05 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetFEMerge.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetFEMerge.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetFEMerge.xml
deleted file mode 100644
index 13a0ece..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetFEMerge.xml
+++ /dev/null
@@ -1,191 +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="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>4</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="serialExecution">true</data>
-  <data name="objectType">PdxVersioned</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">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-<data name="EmptyClientRegion">
-  <snippet>
-    <region name="TestTCR1">
-      <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-      </region-attributes>
-    </region>
-  </snippet>
-</data>
-                                 
-  <data name="isPdxObject">true</data>
-  <data name="funcName">RegionOperationsFunctionPdx</data>   
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="5" name="Client"/>
-
-  <test name="pdxPutGetFEMerge" 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 put one version of pdx class from few clients and get from other clients.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/parReg/pdx/Pdx/csPRPdxFERegion.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="int,Object"  waitTime="3m">
-      <data name="poolSpec">ThinClientPool1</data>
-      <client-set count="5" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="int,Object"  waitTime="5m">
-      <client-set begin="1" count="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-	  <data name="versionNum">1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="int,Object"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
- 	 <!--data name="objectType">PdxVersioned</data-->
-	  <data name="versionNum">2</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="int,Object"  waitTime="5m">
-      <client-set begin="5" count="1" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Create Object" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="DoGetServerKeys" action="doGetServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="5" count="1" name="Client"/>
-    </task>
-    <task name="DoUpdateServerKeys" action="DoUpdateServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="5" count="1" name="Client"/>
-    </task>
-    <task name="Do get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">1</data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="DoGetServerKeys" action="doGetServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="5" count="1" name="Client"/>
-    </task>
-    <task name="DoUpdateServerKeys" action="DoUpdateServerKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="5" count="1" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="int,Object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.smokeperf" argTypes="int,Object"  waitTime="5m"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <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/pdxPutGetMerge.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMerge.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMerge.xml
deleted file mode 100644
index 8c98aa6..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMerge.xml
+++ /dev/null
@@ -1,174 +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="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>4</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="serialExecution">true</data>
-  <data name="objectType">PdxVersioned</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">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-<data name="EmptyClientRegion">
-  <snippet>
-    <region name="TestTCR1">
-      <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-      </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="pdxPutGetMerge" 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 put one version of pdx class from few clients and get from other clients.">
-    <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="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-	  <data name="versionNum">1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
- 	 <!--data name="objectType">PdxVersioned</data-->
-	  <data name="versionNum">2</data>
-    </task>
-    <task name="Create Object" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">1</data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="1" count="2" 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/pdxPutGetMergeWithRI.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMergeWithRI.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMergeWithRI.xml
deleted file mode 100644
index 4237f1e..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetMergeWithRI.xml
+++ /dev/null
@@ -1,177 +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="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>4</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">4</data>
-  <data name="serialExecution">true</data>
-  <data name="objectType">PdxVersioned</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">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-<data name="EmptyClientRegion">
-  <snippet>
-    <region name="TestTCR1">
-      <region-attributes caching-enabled="false" pool-name="_Test_Pool1">
-      </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="pdxPutGetMergeWithRI" 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 put one version of pdx class from few clients and get from other clients with register interest.">
-    <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="2" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-	  <data name="versionNum">1</data>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" argTypes="String,Object"  waitTime="5m">
-      <client-set begin="3" count="2" name="Client"/>
-      <data name="regionSpec">EmptyClientRegion</data>
- 	 <!--data name="objectType">PdxVersioned</data-->
-	  <data name="versionNum">2</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 Object" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">2</data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-        </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Put" action="doPuts" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>update</item>
-         </oneof>
-      </data>
-      <data name="versionNum">1</data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="3" count="2" name="Client"/>
-    </task>
-    <task name="Do Get" action="doGets" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <data name="entryOps">
-        <oneof>
-          <item>get</item>
-         </oneof>
-      </data>
-      <client-set begin="1" count="2" name="Client"/>
-    </task>
-    <task name="ValidateFromSnapshot" action="verifyFromSnapshot" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.pdxtests" waitTime="30m" argTypes="String,Object">
-      <client-set begin="1" count="2" 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/pdxPutGetPdxInstance.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetPdxInstance.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetPdxInstance.xml
deleted file mode 100644
index e57f00c..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxPutGetPdxInstance.xml
+++ /dev/null
@@ -1,135 +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">30</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="clientCount">2</data>
-  <data name="objectType">PdxType</data>
-  <data name="PdxReadSerialized">true</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" 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">
-      </region-attributes>
-    </region>
-  </snippet>
-</data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-                                 
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="Client"/>
-
-  <test name="pdxPutGetPdxInstance" 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 put of pdx class from all clients and get from clientsi and modify the fields of pdx object and verify those field.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 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="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">ThinClientRegion</data-->
-      <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 Object" 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="2" count="1" name="Client"/>
-    </task>
-    <task name="Do put" 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="2" 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="Do put" 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="2" 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>
-    
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionFE.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionFE.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionFE.xml
deleted file mode 100644
index 12d9db6..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionFE.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>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="replicated">true</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>
-  <data name="funcName">RegionOperationsFunctionPdx</data>   
-  <client-set name="JCS1" hostGroup="CS"/>
-  <!--client-set name="JCS2" hostGroup="CS"/-->
-  <client-set count="2" name="Client"/>
-   
-  <test name="pdxReplicatedRegionFE" description="This test creates a replicated 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/csReplicatedPdxRegion.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="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="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.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="DoClearRegion" action="DoClearRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-    </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="DoResetImageBB" action="doResetImageBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" 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.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="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/pdxReplicatedRegionRI.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionRI.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionRI.xml
deleted file mode 100644
index 9d3c060..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/pdxReplicatedRegionRI.xml
+++ /dev/null
@@ -1,153 +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="replicated">true</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 scope="distributed-ack" pool-name="_Test_Pool1" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="true" pool-name="_Test_Pool1" client-notification="true" concurrency-checks-enabled="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <data name="isPdxObject">true</data>
-  <data name="funcName">RegionOperationsFunctionPdx</data>   
-  <client-set name="JCS1" hostGroup="CS"/>
-  <!--client-set name="JCS2" hostGroup="CS"/-->
-  <client-set count="2" name="Client"/>
-
-  <test name="pdxReplicatedRegionExecution" description="This test creates a replicated 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/csReplicatedPdxRegion.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="VerifYRegionContents" action="DoVerifyRegionContentsBeforeOpsOnFeederClient" 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="2" count="1" name="Client"/>
-      <data name="versionNum">2</data>
-    </task-->
-    <!-->task name="VerifYRegionContents" action="doVerifyRegionContents" 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="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="DoClearRegion" action="DoClearRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.functionExecution" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" name="Client"/>
-    </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="DoResetImageBB" action="doResetImageBB" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="10m" argTypes="int,object">
-      <client-set begin="2" count="1" 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.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="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/serialAutoSerializer.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialAutoSerializer.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialAutoSerializer.xml
deleted file mode 100644
index 6768a88..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialAutoSerializer.xml
+++ /dev/null
@@ -1,135 +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="serialExecution">true</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="serialAutoSerilizer" 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>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="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/serialNestedPdxOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialNestedPdxOps.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialNestedPdxOps.xml
deleted file mode 100644
index 7d34add..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialNestedPdxOps.xml
+++ /dev/null
@@ -1,135 +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="clientCount">4</data>
-  <data name="serialExecution">true</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="objectType">Nested</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="serialParRegBridge" 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>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="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/serialParRegBridgePdx.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialParRegBridgePdx.xml b/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialParRegBridgePdx.xml
deleted file mode 100644
index 8c16637..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/Pdx/serialParRegBridgePdx.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="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="serialExecution">true</data>
-  <data name="numPutAllExistingKeys">10</data>
-  <data name="numPutAllNewKeys">0</data>
-  <data name="objectType">PdxVersioned</data>
-  <data name="versionNum">1</data>
-  
-  <data name="ThinClientPool1">
-    <snippet>
-      <pool name="_Test_Pool1" subscription-enabled="true" thread-local-connections="false" min-connections="2" read-timeout="3600000" 
-           subscription-redundancy="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="serialParRegBridge" 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/tx/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>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="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/RemoteQuery/clientEventsFailoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsFailoverQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsFailoverQueryTest.xml
deleted file mode 100644
index 13d95de..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsFailoverQueryTest.xml
+++ /dev/null
@@ -1,206 +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="redundancyLevel">1</data>
-  <data name="minServers">2</data>
- 
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="entryCount">1000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </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 count="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Generics/parReg/pdx/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <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" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="PopulateRegion Portfolios 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="Feeder"/>
-      <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="Feeder"/>
-      <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="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-      <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="Feeder"/>
-      <data name="objectType">PositionPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="2h10m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>query</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</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"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" 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="1h" 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="1h" 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="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <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/pdx/RemoteQuery/clientEventsQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsQueryTest.xml
deleted file mode 100644
index efed2fe..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/clientEventsQueryTest.xml
+++ /dev/null
@@ -1,148 +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="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="entryCount">1000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <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="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 count="10" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <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" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    
-     <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-    </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="Feeder"/>
-      <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="Feeder"/>
-      <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="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,PositionPdx">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="10" name="Client"/>
-      <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="Feeder"/>
-      <data name="objectType">PositionPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="10" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="1h" argTypes="String,PortfolioPdx">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>read</item>
-          <item>read</item>
-          <item>read</item>
-          <item>query</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>query</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</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"/>
-      <client-set count="10" name="Client"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <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/RemoteQuery/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csAckMirror.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csAckMirror.xml
deleted file mode 100644
index 8a0aa48..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csAckMirror.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-     <region name="Positions">
-       <region-attributes scope="distributed-ack" data-policy="replicate">
-         <eviction-attributes>
-           <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-         </eviction-attributes>
-       </region-attributes>
-     </region>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-  <region name="Portfolios3">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-  <region name="Positions">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-
-</cache> 


Mime
View raw message