geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [11/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:22:50 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/sampleJavaCS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/sampleJavaCS.xml b/src/tests/cpp/xml/Misc/sampleJavaCS.xml
deleted file mode 100644
index 8ea97fe..0000000
--- a/src/tests/cpp/xml/Misc/sampleJavaCS.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This xml is an example of how to use the new scripts to manage Java Servers. -->
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <!-- Please note that the endpoints in the region definition below will only be used if
-       the BB does not have a value for "GFE_BB", "EndPoints". 
-       This value is set by the setupJavaServers script.-->
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes scope="distributed-ack" caching-enabled="false" mirroring="false"
-            client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="client"/>
-  
-  <test name="Sample Java CS" description="nada" waitTime="600">
-    <task name="Setup Java CS" action="doRunProcess" container="utils" waitTime="600">
-      <!-- This script takes one argument, the xml file to use as a base in creating the cache.xml the cacheserver will use.
-            The only modification done to the file is to replace "999999999" with the correct port number to use. 
-            This script does expect to find a number of environment variables defined, see comments in the script for details.-->
-      <data name="program">$GFBASE/framework/scripts/setupJavaServers</data>
-      <data name="arguments">csAckMirror.xml</data>
-    </task>
-    <task name="Setup Java CS" action="doRunProcess" container="utils" waitTime="600">
-      <!-- If this script is not given an argument, it starts all the cacheservers that were setup.
-           If it is given an argument, it attempts to use it's first argument as the number of the cacheserver to start. -->
-      <data name="program">$GFBASE/framework/scripts/startJavaServers</data>
-      <data name="arguments"></data>
-    </task>
-    <task name="Create Region" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-    </task>
-    <task name="Destroy Region" action="doLocalDestroyRegion" container="perftests" waitTime="10m"/>
-    <task name="Stop Java CS" action="doRunProcess" container="utils" waitTime="600">
-      <!-- This script will stop the Java Servers. If no argument is given, all servers are stopped.
-           If one argument is given, it is used as the number of the server to stop. -->
-      <data name="program">$GFBASE/framework/scripts/stopJavaServers</data>
-      <data name="arguments"></data>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Misc/smallMembership.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Misc/smallMembership.xml b/src/tests/cpp/xml/Misc/smallMembership.xml
deleted file mode 100755
index bc32e12..0000000
--- a/src/tests/cpp/xml/Misc/smallMembership.xml
+++ /dev/null
@@ -1,20 +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="AckMirrorIl">
-    <snippet>
-      <region name="AckMirrorIl">
-        <region-attributes scope="distributed-ack" mirroring="true" 
-          caching-enabled="true" interest-list-enabled="true"/> 
-      </region>
-    </snippet>
-  </data>
-  
-  <test name="Distributed System" description="Distributed System test" waitTime="5400">
-    <task name="DistributedMemberCount" action="doDistributedMemberCount" container="eventtest" waitTime="600">
-    </task>
-    <task name="Verify CreateRegion-AckMirrorIl" action="doVerifyPeerCount" container="eventtest" waitTime="600">
-      <data name="regionSpec">AckMirrorIl</data>
-      <data name="regionName">AckMirrorIl</data>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/CyberTraderInterestListUpdateTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/CyberTraderInterestListUpdateTest.xml b/src/tests/cpp/xml/MixedMode/CyberTraderInterestListUpdateTest.xml
deleted file mode 100644
index 14cdef6..0000000
--- a/src/tests/cpp/xml/MixedMode/CyberTraderInterestListUpdateTest.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>184877</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>3000</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="CS1" hostGroup="CS"/>
-  <client-set name="CS2" hostGroup="CS"/>
-  <client-set name="JCC1" hostGroup="CS"/>
-  <client-set name="JCC2" hostGroup="CS"/>
-  <client-set name="Publisher"/>
-  <client-set name="Subscriber"/>
-
-  <test name="ThinClientPerf" 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 Native/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="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-t CS1 MixedMode/bridge_client.xml</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-t CS2 MixedMode/bridge_client.xml</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-t CS1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-t CS2</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="Populate Entries in publisher" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Publisher"/>
-    </task>
-    <task name="Register Interest List in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo reg keytype=str keyrange=100-1100 base=AAAAAAAAAA seqid=1 >> JC_CS1_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Register Interest List in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo reg keytype=str keyrange=100-1100 base=AAAAAAAAAA seqid=1 >> JC_CS2_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="waitForRegToFinish" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS1 -p 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForRegToFinish" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS2 -p 1</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Get Entries in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=str keyrange=0-184877 base=AAAAAAAAAA seqid=2 >> JC_CS1_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Get Entries in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=str keyrange=0-184877 base=AAAAAAAAAA seqid=2 >> JC_CS2_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Gets Entries in Subscriber" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-    </task>
-    <task name="waitForGetsToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS1 -p 2</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForGetsToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS2 -p 2</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>500</item>
-        </list>
-      </data>
-      <client-set name="Publisher"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Subscriber"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="Verify update list in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=str keyrange=100-1100 base=AAAAAAAAAA valuesize=500 seqid=3 >> JC_CS1_1.cmd; echo mverify keytype=str keyrange=1100-2000 base=AAAAAAAAAA valuesize=3000 seqid=4 >> JC_CS1_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Verify update list in JC Subscriber" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=str keyrange=100-1100 base=AAAAAAAAAA valuesize=500 seqid=3 >> JC_CS2_1.cmd; echo mverify keytype=str keyrange=1100-2000 base=AAAAAAAAAA valuesize=3000 seqid=4 >> JC_CS2_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Subscriber"/>
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <data name="valueSizes">500</data>
-    </task>
-    <task name="waitForVerifyToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS1 -p 3</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForVerifyToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS2 -p 3</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="waitForVerifyToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS1 -p 4</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForVerifyToFinish for client1" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -t CS2 -p 4</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_CS1_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_CS2_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <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/MixedMode/bridge_client.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/bridge_client.xml b/src/tests/cpp/xml/MixedMode/bridge_client.xml
deleted file mode 100644
index 8f8b62f..0000000
--- a/src/tests/cpp/xml/MixedMode/bridge_client.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Initializes a bridge client for a bridge server that runs on port 40404.
-     Loads values and sends updates to the server. -->
-
-<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" is-server="false">
-  <region name="TestTCR1">
-    <region-attributes scope="local">
-      <cache-loader>
-        <class-name>org.apache.geode.cache.util.BridgeLoader</class-name>
-        <parameter name="endpoints">
-          <string>server=$ENDPOINT</string>
-        </parameter>
-        <parameter name="readTimeout">
-          <string>60000</string>
-        </parameter>
-      </cache-loader>
-      <cache-writer>
-        <class-name>org.apache.geode.cache.util.BridgeWriter</class-name>
-        <parameter name="endpoints">
-          <string>server=$ENDPOINT</string>
-        </parameter>
-        <parameter name="establishCallbackConnection">
-          <string>true</string>
-        </parameter>
-        <parameter name="readTimeout">
-          <string>60000</string>
-        </parameter>
-      </cache-writer>
-      <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/MixedMode/bridge_client_cacheless.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/bridge_client_cacheless.xml b/src/tests/cpp/xml/MixedMode/bridge_client_cacheless.xml
deleted file mode 100644
index 417cbed..0000000
--- a/src/tests/cpp/xml/MixedMode/bridge_client_cacheless.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Initializes a bridge client for a bridge server that runs on port 40404.
-     Loads values and sends updates to the server. -->
-
-<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" is-server="false">
-  <region name="TestTCR1">
-    <region-attributes scope="local">
-      <cache-loader>
-        <class-name>org.apache.geode.cache.util.BridgeLoader</class-name>
-        <parameter name="endpoints">
-          <string>server=$ENDPOINT</string>
-        </parameter>
-        <parameter name="readTimeout">
-          <string>60000</string>
-        </parameter>
-      </cache-loader>
-      <cache-writer>
-        <class-name>org.apache.geode.cache.util.BridgeWriter</class-name>
-        <parameter name="endpoints">
-          <string>server=$ENDPOINT</string>
-        </parameter>
-        <parameter name="establishCallbackConnection">
-          <string>true</string>
-        </parameter>
-        <parameter name="readTimeout">
-          <string>60000</string>
-        </parameter>
-      </cache-writer>
-      <eviction-attributes>
-        <lru-entry-count maximum="1" action="local-destroy"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/clientUserObject.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/clientUserObject.xml b/src/tests/cpp/xml/MixedMode/clientUserObject.xml
deleted file mode 100644
index bb4c2c9..0000000
--- a/src/tests/cpp/xml/MixedMode/clientUserObject.xml
+++ /dev/null
@@ -1,189 +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">UserObject</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="className">
-    <list>
-      <item>ExampleObject</item>
-      <item>User</item>
-    </list>
-  </data>
-  <data name="keyType">str</data>
-  <data name="objValue">15</data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="CS" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-  <client-set name="Reader"/>
-  <client-set name="JCC1" hostGroup="CS"/>
-  <client-set name="JCC2" hostGroup="CS"/>
-  <client-set name="JFeeder" hostGroup="CS"/>
-
-  <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">Native/csAckMirror.xml</data>
-      <client-set name="CS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 1 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 2 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 3 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 2</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 3</data>
-      <client-set name="JFeeder"/>
-    </task>
-
-    <task name="Init CPP clients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <client-set name="Reader"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set name="Feeder"/>
-      <client-set name="Reader"/>
-    </task>
-
-    <task name="put objects at CPP" action="doPuts" container="userobject" waitTime="10m">
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify objects from java client1" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=str base=ExampleObject keyrange=0-100 value=15 valuetype=obj seqid=1 >> JC_1.cmd; echo mverify keytype=str base=User keyrange=0-100 value=15 valuetype=usr seqid=2 >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="wait seq 1 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="wait for seq 2 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 2</data>
-      <client-set name="JCC1"/>
-    </task>
-
-    <task name="put objects into Java at JFeeder" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=str base=ExampleObject keyrange=100-200 value=15 valuetype=obj seqid=3 >> JC_3.cmd; echo mput keytype=str base=User keyrange=100-200 value=15 valuetype=usr seqid=4 >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 3 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 3</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 4 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 4</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="verify objects from JFeeder" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=str base=ExampleObject keyrange=100-200 value=15 valuetype=obj seqid=7 >> JC_3.cmd; echo mverify keytype=str base=User keyrange=100-200 value=15 valuetype=usr seqid=8 >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 7 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 7</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 8 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 8</data>
-      <client-set name="JFeeder"/>
-    </task>
-
-    <task name="get and verify at CPP reader for objects created in CPP" action="doVerifyAll" container="userobject" waitTime="15m">
-      <client-set name="Reader"/>
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">0</data>
-    </task>
-    <task name="get and verify at CPP reader for objects created in Java" action="doVerifyAll" container="userobject" waitTime="15m">
-      <client-set name="Reader"/>
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">100</data>
-    </task>
-    <task name="verify objects from java client2" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=str base=ExampleObject keyrange=0-200 value=15 valuetype=obj seqid=5 >> JC_2.cmd; echo mverify keytype=str base=User keyrange=0-200 value=15 valuetype=usr seqid=6 >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="wait for seq 5 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 5</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="wait for seq 6 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 6</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="finalize" container="userobject" waitTime="5m" continueOnError="true">
-      <client-set name="Feeder"/>
-      <client-set name="Reader"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/clientUserObjectKey.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/clientUserObjectKey.xml b/src/tests/cpp/xml/MixedMode/clientUserObjectKey.xml
deleted file mode 100644
index 3040988..0000000
--- a/src/tests/cpp/xml/MixedMode/clientUserObjectKey.xml
+++ /dev/null
@@ -1,164 +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">UserObject</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="className">
-    <list>
-      <item>ExampleObject</item>
-    </list>
-  </data>
-  <data name="keyType">obj</data>
-  <data name="objValue">15</data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="CS" hostGroup="CS"/>
-  <client-set name="Feeder"/>
-  <client-set name="Reader"/>
-  <client-set name="JCC1" hostGroup="CS"/>
-  <client-set name="JCC2" hostGroup="CS"/>
-  <client-set name="JFeeder" hostGroup="CS"/>
-
-  <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">-e CLASSPATH=\$BUILDDIR/framework/lib/mixed.jar:\$CLASSPATH MixedMode/csAckMirror.xml</data>
-      <client-set name="CS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 1 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 2 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 3 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 2</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 3</data>
-      <client-set name="JFeeder"/>
-    </task>
-
-    <task name="Init CPP clients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <client-set name="Reader"/>
-    </task>
-
-    <task name="put objects at CPP" action="doPuts" container="userobject" waitTime="10m">
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify objects from java client1" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=obj keyrange=0-100 value=15 valuetype=obj seqid=1 >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="wait seq 1 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 1</data>
-      <client-set name="JCC1"/>
-    </task>
-
-    <task name="put objects into Java at JFeeder" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=obj keyrange=100-200 value=15 valuetype=obj seqid=3 >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 3 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 3</data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="verify objects from JFeeder" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=obj keyrange=100-200 value=15 valuetype=obj seqid=7 >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="wait for seq 7 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 3 -p 7</data>
-      <client-set name="JFeeder"/>
-    </task>
-
-    <task name="get and verify at CPP reader for objects created in CPP" action="doVerifyAll" container="userobject" waitTime="15m">
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Reader"/>
-    </task>
-    <task name="get and verify at CPP reader for objects created in Java" action="doVerifyAll" container="userobject" waitTime="15m">
-      <data name="entryCount">100</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set name="Reader"/>
-    </task>
-    <task name="verify objects from java client2" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mverify keytype=obj keyrange=0-200 value=15 valuetype=obj seqid=5 >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="wait for seq 5 to finish" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 5</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_3.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JFeeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="finalize" container="userobject" waitTime="5m" continueOnError="true">
-      <client-set name="Feeder"/>
-      <client-set name="Reader"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="CS"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/csAckMirror.xml b/src/tests/cpp/xml/MixedMode/csAckMirror.xml
deleted file mode 100644
index 5211540..0000000
--- a/src/tests/cpp/xml/MixedMode/csAckMirror.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-    <entry>
-      <key><string>1</string></key>
-      <value>
-        <declarable>
-          <class-name>javaclient.ExampleObject</class-name>
-          <parameter name="id"><string>111</string></parameter>
-        </declarable>
-      </value>
-    </entry>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedMode/perfBenchmarkTCR.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedMode/perfBenchmarkTCR.xml b/src/tests/cpp/xml/MixedMode/perfBenchmarkTCR.xml
deleted file mode 100644
index 6ad4bd0..0000000
--- a/src/tests/cpp/xml/MixedMode/perfBenchmarkTCR.xml
+++ /dev/null
@@ -1,425 +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">100</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>5000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-  <data name="clientCount">2</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS" hostGroup="CS"/>
-  <client-set name="JCC1" hostGroup="CS"/>
-  <client-set name="JCC2" 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" continueOnError="true">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">Native/csAckMirror.xml</data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 1 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="SetupJavaClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">setupJavaClients</data>
-      <data name="arguments">-c 2 MixedMode/bridge_client_cacheless.xml</data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StartCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">startJavaClients</data>
-      <data name="arguments">-c 2</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="2m">
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=0-100000 seqid=1 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Gets-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=0-100000 seqid=1 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Gets-identical" action="doGets" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="waitForGetsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 1</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForGetsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 1</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Puts-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=0-100000 valuesize=5000 seqid=2 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Puts-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=0-100000 valuesize=5000 seqid=2 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Puts-identical" action="doPuts" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="waitForPutsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 2</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForPutsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 2</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Destroys-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=0-100000 seqid=3 >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Destroys-identical-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=0-100000 seqid=3 >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Destroys-identical" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="waitForDestroysToFinish for client1" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 3</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForDestroysToFinish for client2" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 3</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=0-75000 seqid=4 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Gets-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=25000-100000 seqid=4 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Gets-overlap1" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-overlap2" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="waitForGetsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 4</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForGetsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 4</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Puts-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=0-75000 valuesize=5000 seqid=5 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Puts-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=25000-100000 valuesize=5000 seqid=5 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Puts-overlap1" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-overlap2" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="waitForPutsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 5</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForPutsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 5</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Destroys-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=0-75000 seqid=6 >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Destroys-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=25000-100000 seqid=6 >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Destroys-overlap1" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-overlap2" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>75000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">25000</data>
-    </task>
-    <task name="waitForDestroysToFinish for client1" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 6</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForDestroysToFinish for client2" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 6</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="PopulateRegion" action="doPopulateRegion" container="perftests" waitTime="10m">
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Gets-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=0-50000 seqid=7 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Gets-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mget keytype=int keyrange=50000-100000 seqid=7 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Gets-non-overlap1" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Gets-non-overlap2" action="doGets" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="waitForGetsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 7</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForGetsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 7</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Puts-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=0-50000 valuesize=5000 seqid=8 waittime=12>> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Puts-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mput keytype=int keyrange=50000-100000 valuesize=5000 seqid=8 waittime=12>> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Puts-non-overlap1" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Puts-non-overlap2" action="doPuts" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">5</data>
-    </task>
-    <task name="waitForPutsToFinish for client1" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 8</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForPutsToFinish for client2" action="doRunProcess" container="utils" waitTime="12m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 8</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="Destroys-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=0-50000 seqid=9 >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="Destroys-non-overlap-JC" action="doRunProcess" container="utils" waitTime="1m" continueOnError="true">
-      <data name="program">echo mdes keytype=int keyrange=50000-100000 seqid=9 >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="Destroys-non-overlap1" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-    </task>
-    <task name="Destroys-non-overlap2" action="doDestroys" container="perftests" waitTime="10m" parallel="true">
-      <client-set begin="2" count="1" name="ThinClient"/>
-      <data name="distinctKeys">
-        <list>
-          <item>50000</item>
-        </list>
-      </data>
-      <data name="keyIndexBegin">50000</data>
-    </task>
-    <task name="waitForDestroysToFinish for client1" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 1 -p 9</data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="waitForDestroysToFinish for client2" action="doRunProcess" container="utils" waitTime="10m" continueOnError="true">
-      <data name="program">waitForTask</data>
-      <data name="arguments">-m 10 -c 2 -p 9</data>
-      <client-set name="JCC2"/>
-    </task>
-
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_1.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC1"/>
-    </task>
-    <task name="StopCacheClients" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">echo quit >> JC_2.cmd</data>
-      <data name="arguments"></data>
-      <client-set name="JCC2"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" continueOnError="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments"></data>
-      <client-set name="JCS"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest.xml b/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest.xml
deleted file mode 100644
index 33b9d7b..0000000
--- a/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest.xml
+++ /dev/null
@@ -1,250 +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>1000</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>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set name="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 name="CSDriver" hostGroup="CSD"/>
-  <client-set name="Feeder"/>
-  <client-set count="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="10m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 6 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="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="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="StartCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startCSFwk</data>
-      <data name="arguments">--xml=MixedModeCS/clientEventsFailoverQueryTest_CS.xml</data>
-      <data name="background">true</data>
-      <client-set name="CSDriver"/>
-    </task>
-
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="querytests" waitTime="5m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <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="querytests" waitTime="30m">
-      <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="querytests" waitTime="30m">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="PopulateRegion /Portfolios/Positions with Position object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">/Portfolios/Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="2h10m" parallel="true">
-      <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">30m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">1000</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="3" 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="3" 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="3" 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="3" 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="3" waitTime="3h30m" continueOnError="true" parallel="true">
-      <data name="ServerId">6</data>
-      <client-set name="JCS6"/>
-    </task>
-    <task name="WaitForCSharp" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneCSharp 1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="querytests" waitTime="2m"/>
-    <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>
-    <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>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest_CS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest_CS.xml b/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest_CS.xml
deleted file mode 100644
index 7532969..0000000
--- a/src/tests/cpp/xml/MixedModeCS/clientEventsFailoverQueryTest_CS.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="valueSizes">
-    <list>
-      <item>1000</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>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <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="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-     </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-       </region-attributes>
-     </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-  <client-set count="20" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">CPP</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="WaitForPopulate" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="2h10m" parallel="true">
-      <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">30m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">1000</data>
-      <data name="objectType">Portfolio</data>
-      <client-set count="20" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="querytests" waitTime="2m"/>
-    <task name="DoneCSharp" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneCSharp true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest.xml b/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest.xml
deleted file mode 100644
index da00c08..0000000
--- a/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest.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="valueSizes">
-    <list>
-      <item>1000</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>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-
-  <client-set name="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 name="CSDriver" hostGroup="CSD"/>
-  <client-set name="Feeder"/>
-  <client-set count="25" 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 6 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="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="StartCacheServer 6" action="doRunProcess" container="utils" waitTime="10m" >
-      <data name="program">startJavaServers</data>
-      <data name="arguments">6</data>
-      <client-set name="JCS6"/>
-    </task>
-
-    <task name="StartCSharpFwk" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startCSFwk</data>
-      <data name="arguments">--xml=MixedModeCS/clientEventsQueryTest_CS.xml</data>
-      <data name="background">true</data>
-      <client-set name="CSDriver"/>
-    </task>
-
-    <task name="Init Feeder" action="doAddRootAndSubRegion" container="querytests" waitTime="5m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="25" name="Client"/>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <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="querytests" waitTime="30m">
-      <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="querytests" waitTime="30m">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="PopulateRegion /Portfolios/Positions with Position object" action="doPopulateUserObject" container="querytests" waitTime="30m">
-      <data name="regionName">/Portfolios/Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set name="Feeder"/>
-      <client-set count="25" name="Client"/>
-      <data name="sleepTime">2</data>
-    </task>
-
-    <task name="DonePopulate" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DonePopulate true</data>
-      <client-set name="Feeder"/>
-    </task>
-
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="1h10m">
-      <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">1h</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">1000</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-      <client-set count="25" name="Client"/>
-    </task>
-    <task name="WaitForCSharp" action="doRunProcess" container="utils" waitTime="30m" continueOnError="true">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DoneCSharp 1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <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>
-    <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>
-
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest_CS.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest_CS.xml b/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest_CS.xml
deleted file mode 100644
index de06869..0000000
--- a/src/tests/cpp/xml/MixedModeCS/clientEventsQueryTest_CS.xml
+++ /dev/null
@@ -1,95 +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>1000</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>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="false" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-
-
-  <client-set count="25" name="Client"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events">
-    <task name="setupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">CPP</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="querytests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="25" name="Client"/>
-    </task>
-    <task name="WaitForPopulate" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">waitForBBKey</data>
-      <data name="arguments">INTEROP DonePopulate 1200</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Client Events" action="doEntryOperations" container="cacheserver" waitTime="1h10m">
-      <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">1h</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">1000</data>
-      <data name="objectType">Portfolio</data>
-      <client-set count="25" name="Client"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="querytests" waitTime="5m"/>
-    <task name="DoneCSharp" action="doRunProcess" container="utils" waitTime="2m">
-      <data name="program">FwkBB</data>
-      <data name="arguments">set INTEROP DoneCSharp true</data>
-      <client-set count="1" name="Client"/>
-    </task>
-
-  </test>
-</test-driver>


Mime
View raw message