geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [25/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:04 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csNotifySubscription.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csNotifySubscription.xml
deleted file mode 100644
index cecbdcb..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csNotifySubscription.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csPR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csPR.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csPR.xml
deleted file mode 100644
index 7e17a02..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csPR.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" />
-  <region name="Portfolios">
-    <region-attributes data-policy="partition">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerEviction.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerEviction.xml
deleted file mode 100644
index 6d3e38a..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerEviction.xml
+++ /dev/null
@@ -1,15 +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">
-      <eviction-attributes>
-        <lru-entry-count maximum="1000"/>
-      </eviction-attributes>
-    </region-attributes>
-      
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerOverflowToDisk.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerOverflowToDisk.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerOverflowToDisk.xml
deleted file mode 100644
index 16920c5..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csServerOverflowToDisk.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 persistent="true"/>
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate" persist-backup="true">
-      <eviction-attributes>
-        <lru-entry-count maximum="1000" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-    
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csWithIndex.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csWithIndex.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csWithIndex.xml
deleted file mode 100644
index 28d5dce..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/csWithIndex.xml
+++ /dev/null
@@ -1,35 +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" maximum-time-between-pings="600000" />
-  <region name="Portfolios">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index1" type="range" from-clause="/Portfolios" expression="ID" />
-    <index name="index5" type="range" from-clause="/Portfolios.keys" expression="toString" />
-    <!--index name="index7" type="range" from-clause="/Portfolios.values k" expression="nvl(k.position2.toString(),'nopes')"-->
-    <index name="index8" type="range" from-clause="/Portfolios.keys k" expression="k" />
-    <region name="Positions">
-      <region-attributes scope="distributed-ack" data-policy="replicate">
-      </region-attributes>
-    </region>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index2" type="range" from-clause="/Portfolios2" expression="ID" />
-  </region>
-  <region name="Portfolios3">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index3" type="range" from-clause="/Portfolios3" expression="ID" />
-  </region>
-  <region name="Positions">
-    <region-attributes index-update-type="asynchronous" scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-    <index name="index4" type="range" from-clause="/Positions" expression="secId" />
-  </region>
-
-</cache> 

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

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/entryOperationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/entryOperationQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/entryOperationQueryTest.xml
deleted file mode 100644
index 681e2f4..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/entryOperationQueryTest.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>10000</item>
-          <item>500</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-      <data name="destroyKeys">500</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-           <item>select distinct * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>9500</item>
-          <item>475</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/failoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/failoverQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/failoverQueryTest.xml
deleted file mode 100644
index 7c8a640..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/failoverQueryTest.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  	
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-	
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  
-  <data name="minServers">1</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-  <client-set name="Feeder"/>
-	
-  <test name="QueryFailoverTest" description="Thin Client perf test">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <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="CreateRegion" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="3m" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="10" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="1h" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="1h" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="Running Param Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="Running Param Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="45m" 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="45m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </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/regexAndQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/regexAndQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/regexAndQueryTest.xml
deleted file mode 100644
index b4ddf3d..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/regexAndQueryTest.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="ThinClient1"/>
-  <client-set name="ThinClient2"/>
-
-  <test name="ThinClientRegexNQuery" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQuery/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Populate Entries in ThinClient1" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Gets" action="doGetObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <data name="registerRegex">port.*</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="ThinClient2"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Update Entries from ThinClient1" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <data name="valueSizes">
-        <list>
-          <item>100</item>
-          <item>500</item>
-          <item>1000</item>
-          <item>10000</item>
-        </list>
-      </data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">PortfolioPdx</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="45m" parallel="true" argTypes="String,PortfolioPdx">
-      <client-set name="ThinClient2"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverEvictionQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverEvictionQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverEvictionQueryTest.xml
deleted file mode 100644
index 00142e2..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverEvictionQueryTest.xml
+++ /dev/null
@@ -1,85 +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>2000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Generics/parReg/pdx/RemoteQuery/csServerEviction.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for result set test" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select distinct * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverOverflowToDiskQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverOverflowToDiskQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverOverflowToDiskQueryTest.xml
deleted file mode 100644
index 100f241..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQuery/serverOverflowToDiskQueryTest.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </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="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 Generics/parReg/pdx/RemoteQuery/csServerOverflowToDisk.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">PortfolioPdx</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,PortfolioPdx">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,PortfolioPdx"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsFailoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsFailoverQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsFailoverQueryTest.xml
deleted file mode 100644
index 9b411fb..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsFailoverQueryTest.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">4</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>
-    </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>
-  <data name="unsupportedPRQuery">true</data>
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="30" 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">-t CS1 Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 Generics/RemoteQueryPR/csWithOutIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS6"/>
-    </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="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCS6"/>
-    </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="30" name="Client"/>
-    </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="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="30" 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="30" 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="stopStartCacheServer 5" action="doStopStartServer" container="utils" timesToRun="2" waitTime="1h" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="2m" 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>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsQueryTest.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsQueryTest.xml
deleted file mode 100644
index d8c44ff..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/clientEventsQueryTest.xml
+++ /dev/null
@@ -1,141 +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>10000</item>
-    </list>
-  </data>
-  <data name="entryCount">1000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</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>
-  <data name="unsupportedPRQuery">true</data> 
-
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set count="10" name="Client"/>
-
-  <test name="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 4 Generics/parReg/pdx/RemoteQueryPR/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"/>
-    </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="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="1h10m" 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>
-    <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/RemoteQueryPR/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csAckMirror.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csAckMirror.xml
deleted file mode 100644
index 2cc55a7..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csAckMirror.xml
+++ /dev/null
@@ -1,29 +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>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-  </region>
-  <region name="Positions">
-    <region-attributes>
-      <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/RemoteQueryPR/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csNotifySubscription.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csNotifySubscription.xml
deleted file mode 100644
index 2f6f3aa..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csNotifySubscription.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" />
-  <region name="Portfolios">
-    <region-attributes>
-      <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/RemoteQueryPR/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csServerEviction.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csServerEviction.xml
deleted file mode 100644
index 5a266bf..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csServerEviction.xml
+++ /dev/null
@@ -1,69 +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>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-      <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>1</string>
-          </parameter>
-          <parameter name="pkid">
-            <string>Gemstone</string>
-          </parameter>
-          <parameter name="type">
-            <string>type1</string>
-          </parameter>
-          <parameter name="status">
-            <string>active</string>
-          </parameter>
-          <parameter name="newVal">
-            <string>CCCCC</string>
-          </parameter>
-          <parameter name="position1">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>SUN</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>3400</string>
-                </parameter>
-                <parameter name="secType">
-                    <string>r</string>
-                </parameter>
-                <parameter name="pid">
-                    <string>345</string>
-                </parameter>
-            </declarable>
-          </parameter>
-          <parameter name="position2">
-            <declarable>
-                <class-name>javaobject.newapi.Position</class-name>
-                <parameter name="secId">
-                    <string>IBM</string>
-                </parameter>
-                <parameter name="sharesOutstanding">
-                    <string>8765</string>
-                </parameter>
-                <parameter name="secType">
-                   <string>p</string>
-                </parameter>
-                <parameter name="pid">
-                   <string>123</string>
-                </parameter>
-             </declarable>
-          </parameter>
-        </declarable>
-      </value>
-     </entry>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml
deleted file mode 100644
index a72f175..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndex.xml
+++ /dev/null
@@ -1,41 +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" maximum-time-between-pings="600000" />
-  <region name="IndexRegion">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    
-  </region>
-  <region name="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index1" type="range" from-clause="/Portfolios" expression="ID" />
-    <index name="index5" type="range" from-clause="/Portfolios.keys" expression="toString" />
-    <!--index name="index7" type="range" from-clause="/Portfolios.values k" expression="nvl(k.position2.toString(),'nopes')" -->
-    <index name="index8" type="range" from-clause="/Portfolios.keys k" expression="k" />
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index2" type="range" from-clause="/Portfolios2" expression="ID" />
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index3" type="range" from-clause="/Portfolios3" expression="ID" />
-  </region>
-  <region name="Positions">
-    <region-attributes>
-      <partition-attributes redundant-copies="0"/>
-    </region-attributes>
-    <index name="index4" type="range" from-clause="/Positions" expression="secId" />
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml
deleted file mode 100644
index aaf1e16..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithIndexRC2.xml
+++ /dev/null
@@ -1,42 +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" maximum-time-between-pings="600000" />
-  <region name="IndexRegion">
-    <!--region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes-->
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-    
-  </region>
-  <region name="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index1" type="range" from-clause="/Portfolios" expression="ID" />
-    <index name="index5" type="range" from-clause="/Portfolios.keys" expression="toString" />
-    <index name="index7" type="range" from-clause="/Portfolios.values k" expression="nvl(k.position2.toString(),'nopes')" />
-    <index name="index8" type="range" from-clause="/Portfolios.keys k" expression="k" />
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index2" type="range" from-clause="/Portfolios2" expression="ID" />
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index3" type="range" from-clause="/Portfolios3" expression="ID" />
-  </region>
-  <region name="Positions">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-    <index name="index4" type="range" from-clause="/Positions" expression="secId" />
-  </region>
-
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithOutIndexRC2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithOutIndexRC2.xml b/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithOutIndexRC2.xml
deleted file mode 100644
index 28f9ad7..0000000
--- a/src/tests/cpp/xml/Generics/parReg/pdx/RemoteQueryPR/csWithOutIndexRC2.xml
+++ /dev/null
@@ -1,35 +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" maximum-time-between-pings="600000" />
-  <region name="IndexRegion">
-    <!--region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes-->
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-   
-  </region>
-  <region name="Portfolios">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <region name="Portfolios2">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <region name="Portfolios3">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-  <region name="Positions">
-    <region-attributes>
-      <partition-attributes redundant-copies="2"/>
-    </region-attributes>
-  </region>
-
-</cache> 

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


Mime
View raw message