geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [30/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:23:09 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/concRRFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/concRRFailover.xml b/src/tests/cpp/xml/Generics/ResumableTx/concRRFailover.xml
deleted file mode 100755
index 9e0f017..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/concRRFailover.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>
-      <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="minServers">2</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="ConcurrentRRFailOverTest" 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/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="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>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="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/concRRWithOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/concRRWithOps.xml b/src/tests/cpp/xml/Generics/ResumableTx/concRRWithOps.xml
deleted file mode 100755
index 4df5ff0..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/concRRWithOps.xml
+++ /dev/null
@@ -1,156 +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="ConcurrentRRTest" 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/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="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>
-          <!--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="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/csPRTx.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/csPRTx.xml b/src/tests/cpp/xml/Generics/ResumableTx/csPRTx.xml
deleted file mode 100755
index d7eef82..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/csPRTx.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="TestTCR1">
-    <region-attributes data-policy="partition">
-      <partition-attributes redundant-copies="2" total-num-buckets="20">
-        <partition-resolver>
-          <class-name>javaobject.ModPartitionResolver</class-name>
-        </partition-resolver>
-      </partition-attributes>
-    </region-attributes>
-  </region>
- </cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/csTx.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/csTx.xml b/src/tests/cpp/xml/Generics/ResumableTx/csTx.xml
deleted file mode 100755
index 4b30cad..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/csTx.xml
+++ /dev/null
@@ -1,11 +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">
-    </region-attributes>
-  </region>
- </cache>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/resumableTx.list
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/resumableTx.list b/src/tests/cpp/xml/Generics/ResumableTx/resumableTx.list
deleted file mode 100644
index d13ad81..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/resumableTx.list
+++ /dev/null
@@ -1,6 +0,0 @@
-Generics/ResumableTx/concPRWithOps.xml
-Generics/ResumableTx/concRRWithOps.xml
-Generics/ResumableTx/serialPRWithOps.xml
-Generics/ResumableTx/serialRRWithOps.xml
-Generics/ResumableTx/concRRFailover.xml
-Generics/ResumableTx/serialRRFailover.xml

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/serialPRFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/serialPRFailover.xml b/src/tests/cpp/xml/Generics/ResumableTx/serialPRFailover.xml
deleted file mode 100755
index ce124ec..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/serialPRFailover.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">60</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>2</item>
-    </list>
-  </data>
-  
-  <data name="minServers">3</data>
- 
-    <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>10</item>
-    </oneof>
-  </data>
-  
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </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"/>
-      </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="1" name="Client"/>
-  
-  <test name="SerialPRFailoverTest" description="Serial test threads begin the transaction do tryResume+RandomOps+Suspend commit in a serial fashion along with failover and then validation is done">
-    <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 name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set 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 name="Client"/>
-    </task>
-    <task name="Begin TX" action="doBeginTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isBeginTX">true</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="do Serial Tx with Random Ops" action="doSerialTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>invalidate</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>destroy</item>
-          <item>update</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="isSerialExecution">true</data>
-      <client-set name="Client"/>
-    </task> 
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="5m" 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="5m" 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 name="Client"/>
-      <data name="sleepTime">10</data>
-    </task>
-    <task name="Commit TX" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCommitTX">true</data>
-      <client-set 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/serialPRWithOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/serialPRWithOps.xml b/src/tests/cpp/xml/Generics/ResumableTx/serialPRWithOps.xml
deleted file mode 100755
index 117f584..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/serialPRWithOps.xml
+++ /dev/null
@@ -1,119 +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">10</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>2</item>
-    </list>
-  </data>
-  
- 
-  <data name="commitPercentage">80</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"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Client"/>
-  
-  <test name="SerialPRWithRandomOps" description="Serial test threads begin the transaction do tryResume+RandomOps+Suspend commit in a serial fashion and then validation is done">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set 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 name="Client"/>
-    </task>
-    <task name="Begin TX" action="doBeginTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isBeginTX">true</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="do Serial Tx with Random Ops" action="doSerialTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>invalidate</item>
-          <item>update</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="isSerialExecution">true</data>
-      <client-set name="Client"/>
-    </task> 
-    <task name="Commit TX" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCommitTX">true</data>
-      <client-set 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>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/ResumableTx/serialRRFailover.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/serialRRFailover.xml b/src/tests/cpp/xml/Generics/ResumableTx/serialRRFailover.xml
deleted file mode 100755
index 924d43c..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/serialRRFailover.xml
+++ /dev/null
@@ -1,171 +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">10</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>2</item>
-    </list>
-  </data>
-  
-  <data name="minServers">2</data>
- 
-    <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <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="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"/>
-      </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="1" name="Client"/>
-  
-  <test name="SerialRRFailoverTest" description="Serial test threads begin the transaction do tryResume+RandomOps+Suspend commit in a serial fashion along with failover and then validation is done">
-    <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/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="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 name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set 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 name="Client"/>
-    </task>
-    <task name="Begin TX" action="doBeginTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isBeginTX">true</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="do Serial Tx with Random Ops" action="doSerialTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String" parallel="true">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-        </oneof>
-      </data>
-      <data name="isSerialExecution">true</data>
-      <client-set 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 name="Client"/>
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Commit TX" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCommitTX">true</data>
-      <client-set 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/serialRRWithOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/ResumableTx/serialRRWithOps.xml b/src/tests/cpp/xml/Generics/ResumableTx/serialRRWithOps.xml
deleted file mode 100755
index e78045b..0000000
--- a/src/tests/cpp/xml/Generics/ResumableTx/serialRRWithOps.xml
+++ /dev/null
@@ -1,119 +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">10</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>2</item>
-    </list>
-  </data>
-  
- 
-  <data name="commitPercentage">80</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"/>
-      </region>
-    </snippet>
-  </data>
-  
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Client"/>
-  
-  <test name="SerialRRWithRandomOps" description="Serial test threads begin the transaction do tryResume+RandomOps+Suspend commit in a serial fashion and then validation is done">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/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="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="CreatePool" action="doCreatePool" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="poolSpec">ThinClientPool</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <client-set 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 name="Client"/>
-    </task>
-    <task name="Begin TX" action="doBeginTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isBeginTX">true</data>
-      <client-set name="Client"/>
-    </task>
-    <task name="do Serial Tx with Random Ops" action="doSerialTxWithOps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="5m" argTypes="Int32,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>invalidate</item>
-        </oneof>
-      </data>
-      <data name="isSerialExecution">true</data>
-      <client-set name="Client"/>
-    </task> 
-    <task name="Commit TX" action="doFinishAllActiveTx" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.resumabletx" waitTime="15m" argTypes="Int32,String">
-      <data name="regionName">TestTCR1</data>
-      <data name="isCommitTX">true</data>
-      <client-set 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>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzFailoverTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzFailoverTest.xml b/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzFailoverTest.xml
deleted file mode 100644
index 16593da..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzFailoverTest.xml
+++ /dev/null
@@ -1,274 +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="securityScheme">
-   <list>
-     <item>LDAP</item>
-     <item>DUMMY</item>
-     <item>PKCS</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</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="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </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="WriterClient"/>
-  <client-set count="10" name="ReaderClient"/>
-  <client-set count="10" name="QueryClient"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,byte[]">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 4 Native/csAckMirrorSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StartCacheServer 4" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">4</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-        </list>
-      </data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClientsWithWriterAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-          <item>destroy</item>
-        </list>
-      </data>
-      <client-set count="10" name="WriterClient"/>
-    </task>
-    <task name="CreateClientsWithReaderAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>get</item>
-          <item>register_interest</item>
-          <item>unregister_interest</item>
-        </list>
-      </data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>
-    <task name="CreateClientsWithQueryAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>query</item>
-        </list>
-      </data>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="40m" argTypes="String,byte[]">
-      <data name="entryCount">10000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" parallel="true" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>getServerKeys</item> 
-          <item>regNUnregInterest</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">10</data>
-      <client-set count="10" name="WriterClient"/>
-      <client-set count="10" name="ReaderClient"/>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="stopStartCacheServer 4" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,byte[]">
-      <data name="ServerId">4</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS4"/>
-    </task>
-    <task name=" Validate on Writer Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Writer Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>get</item>
-         <item>getServerKeys</item>
-         <item>regNUnregInterest</item>
-         <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>query</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Query Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>query</item>
-         <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name=" Validate on Query Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>get</item>
-         <item>getServerKeys</item>
-         <item>regNUnregInterest</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 4" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <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/Security/Native/clientAuthnAndAuthzTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTest.xml b/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTest.xml
deleted file mode 100644
index ea7449d..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTest.xml
+++ /dev/null
@@ -1,227 +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="securityScheme">
-   <list>
-     <item>DUMMY</item>
-     <item>PKCS</item>
-     <item>LDAP</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="true"/>
-      </region>
-    </snippet>
-  </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 count="10" name="WriterClient"/>
-  <client-set count="10" name="ReaderClient"/>
-  <client-set count="10" name="QueryClient"/>
-
-  <test name="Thin Client Entry Events" description="Clients perform entry events" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,byte[]">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 Native/csAckMirrorSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="Init Feeder" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-        </list>
-      </data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="CreateClientsWithWriterAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>create</item>
-          <item>update</item>
-          <item>destroy</item>
-        </list>
-      </data>
-      <client-set count="10" name="WriterClient"/>
-    </task>
-    <task name="CreateClientsWithReaderAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>get</item>
-          <item>register_interest</item>
-          <item>unregister_interest</item>
-        </list>
-      </data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>
-    <task name="CreateClientsWithQueryAuthZ" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name="securityParams">
-        <list>
-          <item>query</item>
-        </list>
-      </data>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name="FeedSystem" action="doFeed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="40m" argTypes="String,byte[]">
-      <data name="entryCount">10000</data>
-      <data name="opsSecond">1200</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="30m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>getServerKeys</item>
-          <item>regNUnregInterest</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <data name="valueSizes">10</data>
-      <client-set count="10" name="WriterClient"/>
-      <client-set count="10" name="ReaderClient"/>
-      <client-set count="10" name="QueryClient"/>
-    </task>
-    <task name=" Validate on Writer Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Writer Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>regNUnregInterest</item>
-          <item>query</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="WriterClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>get</item>
-         <item>getServerKeys</item>
-         <item>regNUnregInterest</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Reader Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="int,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>query</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="ReaderClient"/>
-    </task>  
-    <task name=" Validate on Query Client with valid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>query</item>
-          <item>cq</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">true</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name=" Validate on Query Client with invalid Authz" action="doValidateEntryOperationsForSecurity" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,byte[]">
-      <data name="entryOps">
-        <list>
-         <item>create</item>
-         <item>update</item>
-         <item>destroy</item>
-         <item>get</item>
-         <item>getServerKeys</item>
-         <item>regNUnregInterest</item>
-        </list>
-      </data>
-      <data name="isExpectedPass">false</data>
-      <client-set count="10" name="QueryClient"/>
-    </task>  
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,byte[]">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestFailoverMU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestFailoverMU.xml b/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestFailoverMU.xml
deleted file mode 100644
index 070b5c3..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestFailoverMU.xml
+++ /dev/null
@@ -1,176 +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="securityScheme">
-   <list>
-      <item>DUMMY</item>
-      <item>LDAP</item>
-      <item>PKCS</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-  
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">2</data>
-  <data name="isFailover">true</data>
-  
-  <data name="sleepTime">
-    <oneof>
-      <item>20</item>
-      <item>30</item>
-      <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="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="2" name="Client"/>
-  
-  <test name="MultiUser Security tests" description="To verify multiple users Authentication and Authorization in Failover case" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,String">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH -c 3 Security/Native/csAckMirrorSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="CreateClient" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="10m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name ="multiUserMode">true</data>
-      <data name="MultiUsers">9</data>
-      <data name="LDAP">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="PKCS">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="DUMMY">
-        <oneof>
-         <item>user</item>  
-        </oneof>    
-      </data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="FeedSystem" action="doFeedTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="40m" argTypes="String,String">
-      <data name="entryCount">10000</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForMU" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="30m" parallel="true" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>getServerKeys</item>
-          <item>putAll</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>executefunction</item>
-          <item>executefunction</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <client-set count="2" name="Client"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true"  argTypes="String,String">
-      <data name="ServerId">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,String">
-      <data name="ServerId">2</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="stopStartCacheServer 3" action="doStopStartServer" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true" argTypes="String,String">
-      <data name="ServerId">3</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name=" Validate for per user" action="doValidateEntryOperationsForPerUser" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="5m" argTypes="String,String">
-       <client-set count="2" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestMU.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestMU.xml b/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestMU.xml
deleted file mode 100644
index f0e58ac..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/clientAuthnAndAuthzTestMU.xml
+++ /dev/null
@@ -1,100 +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="securityScheme">
-   <list>
-      <item>DUMMY</item>
-      <item>LDAP</item>
-      <item>PKCS</item>
-   </list>
-  </data>
-  
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes scope="distributed-ack" caching-enabled="false" client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="5" name="Client"/>
-  
-  <test name="MultiUser Security tests" description="To verify multiple users Authentication and Authorization" timesToRun="3">
-    <task name="SetupCacheServer" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="5m" argTypes="String,String">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Security/Native/csAckMirrorSecurity.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m"  argTypes="String,String">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <data name="securityParams">:authenticator:authorizer</data>
-      <data name ="multiUserMode">true</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateClient" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="10m" argTypes="String,String">
-      <data name="regionSpec">ThinClientRegion</data>
-      <data name ="multiUserMode">true</data>
-      <data name="MultiUsers">9</data>
-      <data name="LDAP">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="PKCS">
-        <oneof>
-         <item>gemfire</item>  
-        </oneof>    
-      </data>
-      <data name="DUMMY">
-        <oneof>
-         <item>user</item>  
-        </oneof>    
-      </data>
-      <client-set count="5" name="Client"/>
-   
-    </task>
-    <task name="FeedSystem" action="doFeedTask" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="40m" argTypes="String,String">
-      <data name="entryCount">10000</data>
-      <client-set count="1" name="Client"/>
-    </task>
-    <task name="Client Events" action="doEntryOperationsForMU" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="30m" argTypes="String,String">
-      <data name="entryOps">
-        <oneof>
-          <item>create</item>
-          <item>update</item>
-          <item>update</item>
-          <item>get</item>
-          <item>get</item>
-          <item>getServerKeys</item>
-          <item>getServerKeys</item>
-          <item>destroy</item>
-          <item>destroy</item>
-          <item>putAll</item>
-          <item>putAll</item>
-          <item>query</item>
-          <item>query</item>
-          <item>cq</item>
-          <item>cq</item>
-          <item>executefunction</item>
-          <item>executefunction</item>
-        </oneof>
-      </data>
-      <data name="workTime">7m</data>
-      <data name="opsSecond">12</data>
-      <data name="entryCount">10000</data>
-      <client-set count="5" name="Client"/>
-    </task>
-    <task name=" Validate for per user" action="doValidateEntryOperationsForPerUser" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="5m" argTypes="String,String">
-       <client-set count="5" name="Client"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.multiusersecurity" waitTime="2m" argTypes="String,String"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.utils" waitTime="10m" parallel="true" argTypes="String,String">
-      <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/Security/Native/csAckMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csAckMirror.xml b/src/tests/cpp/xml/Generics/Security/Native/csAckMirror.xml
deleted file mode 100644
index 99da0ac..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csAckMirror.xml
+++ /dev/null
@@ -1,10 +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-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csAckMirrorSecurity.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csAckMirrorSecurity.xml b/src/tests/cpp/xml/Generics/Security/Native/csAckMirrorSecurity.xml
deleted file mode 100644
index ea9b92c..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csAckMirrorSecurity.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM"/>
-  <region name="Portfolios">
-    <region-attributes scope="distributed-ack" data-policy="replicate"/>
-  </region>                                 
-  <function-service>
-    <function>
-      <class-name>javaobject.RegionOperationsFunction</class-name>
-    </function>
-    <function>
-      <class-name>javaobject.ServerOperationsFunction</class-name>
-    </function>
-  </function-service>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csConflationNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csConflationNotifySubscription.xml b/src/tests/cpp/xml/Generics/Security/Native/csConflationNotifySubscription.xml
deleted file mode 100644
index 2ad8297..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csConflationNotifySubscription.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate" enable-subscription-conflation="true">
-      <eviction-attributes>
-        <lru-memory-size maximum="$LRU_MEM" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csHlru.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csHlru.xml b/src/tests/cpp/xml/Generics/Security/Native/csHlru.xml
deleted file mode 100644
index 5800a58..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csHlru.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-      <eviction-attributes>
-        <lru-memory-size maximum="500" action="overflow-to-disk"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csMirror.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csMirror.xml b/src/tests/cpp/xml/Generics/Security/Native/csMirror.xml
deleted file mode 100644
index fd1d1cb..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csMirror.xml
+++ /dev/null
@@ -1,11 +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-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack" data-policy="replicate">
-    </region-attributes>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csNotifySubscription.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csNotifySubscription.xml b/src/tests/cpp/xml/Generics/Security/Native/csNotifySubscription.xml
deleted file mode 100644
index 08dd68a..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csNotifySubscription.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <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>
-  </region>
-</cache> 

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/Security/Native/csServerEviction.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/Security/Native/csServerEviction.xml b/src/tests/cpp/xml/Generics/Security/Native/csServerEviction.xml
deleted file mode 100644
index dee4fb2..0000000
--- a/src/tests/cpp/xml/Generics/Security/Native/csServerEviction.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-       version="1.0">
-  <cache-server port="$PORT_NUM" maximum-message-count="50000"/>
-  <region name="TestTCR1">
-    <region-attributes scope="distributed-ack">
-      <eviction-attributes>
-        <lru-heap-percentage maximum="70" time-interval="100"/>
-      </eviction-attributes>
-    </region-attributes>
-  </region>
-</cache> 


Mime
View raw message