geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [31/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:10 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsQueryTest.xml
deleted file mode 100644
index 631f95a..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/clientEventsQueryTest.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="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">10000</data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <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 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/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,Portfolio">
-      <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,Portfolio">
-      <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,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <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,Portfolio">
-      <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">15m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</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,Portfolio"/>
-    <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/RemoteQueryPR/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csAckMirror.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csAckMirror.xml
deleted file mode 100644
index aa662a5..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csAckMirror.xml
+++ /dev/null
@@ -1,86 +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-->
-          <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>
-  <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/RemoteQueryPR/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csNotifySubscription.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csNotifySubscription.xml
deleted file mode 100644
index d20ed43..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csNotifySubscription.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/RemoteQueryPR/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csServerEviction.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csServerEviction.xml
deleted file mode 100644
index 5a266bf..0000000
--- a/src/tests/cpp/xml/Generics/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/RemoteQueryPR/csWithIndex.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndex.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndex.xml
deleted file mode 100644
index 09bc293..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndex.xml
+++ /dev/null
@@ -1,97 +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>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>76343</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>
-  <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/RemoteQueryPR/csWithIndexRC2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndexRC2.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndexRC2.xml
deleted file mode 100644
index 28c08c8..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithIndexRC2.xml
+++ /dev/null
@@ -1,98 +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"/>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>76343</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>
-  <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/RemoteQueryPR/csWithOutIndexRC2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithOutIndexRC2.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithOutIndexRC2.xml
deleted file mode 100644
index ee3a9b4..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/csWithOutIndexRC2.xml
+++ /dev/null
@@ -1,91 +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"/>
-    <entry>
-      <key><string>port1-1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaobject.newapi.Portfolio</class-name>
-          <parameter name="ID">
-            <string>76343</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>
-  <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/RemoteQueryPR/dataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/dataValidationQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/dataValidationQueryTest.xml
deleted file mode 100644
index 3321d94..0000000
--- a/src/tests/cpp/xml/Generics/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 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/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,Portfolio">
-      <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,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="string,Position">
-      <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,Position">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</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,Portfolio">
-      <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,Portfolio">
-      <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,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/distributedDataValidationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/distributedDataValidationQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/distributedDataValidationQueryTest.xml
deleted file mode 100644
index 598f208..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/distributedDataValidationQueryTest.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="client1"/>
-  <client-set name="client2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csWithIndex.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers CS2" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <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,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="client1"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="client1"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="client1"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Position">
-      <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,Position">
-      <data name="regionName">Positions</data>
-      <client-set name="client1"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="5" waitTime="30m" argTypes="String,Portfolio">
-      <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,Portfolio">
-      <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,Portfolio">
-      <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,Portfolio">
-      <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,Portfolio"/>
-    <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/RemoteQueryPR/entryOperationQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/entryOperationQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/entryOperationQueryTest.xml
deleted file mode 100644
index 5fec626..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/entryOperationQueryTest.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <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,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <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,Portfolio">
-      <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,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</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,Portfolio">
-      <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,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/failoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/failoverQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/failoverQueryTest.xml
deleted file mode 100644
index 6020101..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/failoverQueryTest.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">4</data>
- 	
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-	
-  <data name="valueSizes">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-	
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-      <item>120</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="Feeder"/>
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set name="JCS6" hostGroup="CS"/>
-  <client-set count="10" name="ThinClient"/>
-
-  <test name="QueryFailoverTest" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csWithIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 7 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csWithOutIndexRC2.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StartCacheServer 7" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">7</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="3m" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="10" name="ThinClient"/>
-      <data name="sleepTime">3</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="20" waitTime="1h" continueOnError="true" parallel="true" argTypes="String,Portfolio">
-      <client-set begin="1" count="5" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="Running Query for struct set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="20" waitTime="1h" continueOnError="true" parallel="true" argTypes="String,Portfolio">
-      <client-set begin="6" count="5" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-    </task>
-     <task name="Running Param Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" timesToRun="10" waitTime="60m" parallel="true" argTypes="String,Portfolio">
-      <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,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <data name="queryResultType">structSet</data>
-      <data name="paramquery">true</data>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" 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="3h30m" 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="3h30m" 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="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="stopStartCacheServer 6" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="stopStartCacheServer 7" action="doStopStartServer" container="utils" timesToRun="2" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">7</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="10" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServer 5" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="StopCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="StopCacheServer 7" action="doRunProcess" container="utils" waitTime="10m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">7</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/RemoteQueryPR/regexAndQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/regexAndQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/regexAndQueryTest.xml
deleted file mode 100644
index 4de9688..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/regexAndQueryTest.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="ThinClient1"/>
-  <client-set name="ThinClient2"/>
-
-  <test name="ThinClientRegexNQuery" description="Thin Client perf test">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csNotifySubscription.xml</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="CS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="CS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <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,Portfolio">
-      <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,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="ThinClient1"/>
-    </task>
-    <task name="Gets" action="doGetObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="ThinClient2"/>
-    </task>
-    <task name="Register Regex List" action="doRegisterRegexList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="15m" argTypes="String,Portfolio">
-      <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,Portfolio">
-      <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">Portfolio</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,Portfolio">
-      <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,Portfolio">
-      <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,Portfolio"/>
-    <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/RemoteQueryPR/serverEvictionQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/RemoteQueryPR/serverEvictionQueryTest.xml b/src/tests/cpp/xml/Generics/RemoteQueryPR/serverEvictionQueryTest.xml
deleted file mode 100644
index 4cd4e0c..0000000
--- a/src/tests/cpp/xml/Generics/RemoteQueryPR/serverEvictionQueryTest.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQueryPR/csServerEviction.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"> 
-      <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,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <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,Portfolio">
-      <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,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/basicTx.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/basicTx.xml b/src/tests/cpp/xml/Generics/ResumableTx/basicTx.xml
deleted file mode 100755
index faa4328..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/basicTx.xml
+++ /dev/null
@@ -1,81 +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">600</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</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">3</data>
-  <data name="minExecutions">100</data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" locators="true" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" />
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-   
-  <test name="BasicTransactiontest" description="This is a Basic test ,which will test the general transactional flow with a single Thread.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 1 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="String,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="String,String">
-      <client-set count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="String,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Populate Entries" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="String,String">
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Basic Transactions " action="doBasicTX" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="String,String">
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="String,String"/>
-    <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/ResumableTx/concPRFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/concPRFailover.xml b/src/tests/cpp/xml/Generics/ResumableTx/concPRFailover.xml
deleted file mode 100755
index 940f7f8..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/concPRFailover.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">5m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  <data name="TxBool">
-    <oneof>
-      <item>true</item>
-      <item>false</item>
-    </oneof>
-  </data>
-  
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <item>40</item>
-      <item>50</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-  
-  <data name="minServers">3</data>
-  
-  <data name="keyType">str</data>
-  <data name="clientCount">3</data>
-  <data name="isConcurrentExecution">true</data>
-  <data name="minExecutions">10</data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" servers="true"/>
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-         <cache-listener library="resumabletx" function="createSilenceListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-  
-  <test name="ConcurrentPRFailOverTest" description="This test runs with multiple bridgeServers and edge clients.  The servers host a PartitionedRegion. 
-Edge clients execute concurrent resumeable transactions using function execution. Active transactions are maintained in a map on the BB.
-After a configurable mininum number of suspend+doOps+resume executions have completed the transactions are committed.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csPRTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Do Conc Tx With Random Ops" action="doConcTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String" parallel="true">
-       <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <!--item>invalidate</item-->
-          <!--item>destroy</item-->
-          <item>update</item>
-          <item>get</item>
-          <!--item>putAll</item-->          
-        </oneof>
-      </data>
-      <data name="opsSecond">5</data>
-      <data name="regionName">TestTCR1</data>
-      <data name="workTime">100</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="3" name="Client"/>
-    </task> 
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="40m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set count="3" name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>	
-    <task name="finish All Active Tx" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/concPRWithOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/concPRWithOps.xml b/src/tests/cpp/xml/Generics/ResumableTx/concPRWithOps.xml
deleted file mode 100755
index fb787ec..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/concPRWithOps.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">5m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>5</item>
-    </list>
-  </data>
-  <data name="TxBool">
-    <oneof>
-      <item>true</item>
-      <item>false</item>
-    </oneof>
-  </data>
-  
-  <data name="keyType">str</data>
-  <data name="clientCount">3</data>
-  <data name="isConcurrentExecution">true</data>
-  <data name="minExecutions">10</data>
-  
-  <data name="ThinClientPool">
-    <snippet>
-      <pool name="_Test_Pool1" min-connections="2" thread-local-connections="true" subscription-enabled="true" subscription-redundancy="-1" servers="true"/>
-    </snippet>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" pool-name="_Test_Pool1" client-notification="true">
-         <cache-listener library="resumabletx" function="createSilenceListener"/>
-        </region-attributes> 
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="JCS4" hostGroup="CS"/>
-  <client-set name="JCS5" hostGroup="CS"/>
-  <client-set count="3" name="Client"/>
-  
-  <test name="ConcurrentPRTest" description="This test runs with multiple bridgeServers and edge clients.  The servers host a PartitionedRegion. 
-Edge clients execute concurrent resumeable transactions using function execution. Active transactions are maintained in a map on the BB.
-After a configurable mininum number of suspend+doOps+resume executions have completed the transactions are committed.">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 5 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/ResumableTx/csPRTx.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-    <task name="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="2m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Do Conc Tx With Random Ops" action="doConcTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-       <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="opsSecond">5</data>
-      <data name="regionName">TestTCR1</data>
-      <data name="workTime">100</data>
-      <data name="entryCount">100</data>
-      <data name="valueSizes">100</data>
-      <client-set count="3" name="Client"/>
-    </task> 
-    <task name="doSleep" action="doSleep" container="utils" waitTime="160">
-      <client-set count="3" name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>	
-    <task name="finish All Active Tx" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <client-set count="3" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">5</data>
-      <client-set name="JCS5"/>
-    </task>
-  </test>
-</test-driver>


Mime
View raw message